summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Update chromium submoduleKai Koehne2015-08-181-0/+0
| | | | | | | | | | | | | New changes: b34aef8 Revert "<third_party/jinja2> FIXUP: Prevent a python IOError on Windows" 759f070 <tools/gyp> Prevent a python IOError on Windows 1ee586d <chromium> Disable termination on out of memory. 0691b4e <third_party/WebKit> FIXUP: Prevent a python IOError on Windows 6e4f55a <chromium> MSVC: Fix build issues when using std::numeric_limits::max Change-Id: I703de804ce5fd0f5ff827a193a6cb175e292b337 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix crash on XCB GLES2 and WaylandAllan Sandfeld Jensen2015-08-121-6/+0
| | | | | | | | | We can and must request the "egldisplay" from QPA, otherwise we get the wrong resource. Task-number: QTBUG-47301 Change-Id: I8bcd94415aa8f22b0d868ad751017f5babddf751 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fully qualify libEGL.so.1, libEGLESv2.so.2 librariesKai Koehne2015-08-111-2/+2
| | | | | | | | | | | | look up the libEGL, libEGLESv2 libraries by their major version number when loading them dynamically on embedded Linux. The libEGL.so, libEGLESv2.so files are usually only there when development packages are installed. Change-Id: Ic17976506064008540201ceffa12077e1b2173f8 Task-number: QTBUG-45801 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Doc: Added a note about setting feature permission to a pageVenugopal Shivashankar2015-08-111-0/+4
| | | | | | | | | | The feature premissions set ahead of a feature request has no effect. The QWebEnginePage::setFeaturePermission method serves pending feature requests only. Task-number: QTBUG-47173 Change-Id: Ifff4dadc56fae1ecdcce9029a15d57576a830923 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Fixup QWebEngineScript documentation.Pierre Rossi2015-08-051-2/+1
| | | | | | | drop the preliminary as it is public API, and fix a typo. Change-Id: I2753ef06f9afc9f7a9526353286fb22d239e3b5f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix docs to use iconUrl/iconUrlChanged.Florian Bruhin2015-08-042-4/+4
| | | | | | | | The docs presumably were copied from QtWebKit and this didn't get adjusted when icon()/iconChanged() was changed to iconUrl()/iconUrlChanged(). Change-Id: Iccecc7b0e1c69f5242bddae2dedb4135120e3519 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Make QtWebEngineProcess use full 4 GiByte of memoryKai Koehne2015-08-031-0/+2
| | | | | | | | | | Pass /LARGEADDRESSAWARE the the MSVC linker to allow allocating more than two GiByte of memory for 32 bit. The flag is a NOOP for 64 bit. Task-number: QTBUG-47129 Change-Id: I82c4a7bc99e9042c4901425b37202d7977c0bcaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix error message for OpenGL resource sharingPeter Varga2015-07-311-1/+5
| | | | | | | | | Method nativeResourceForContext() fails if share context is not set. It may be called earlier than method ShareGroupQtQuick::AboutToAddFirstContext() that performs the same check. Change-Id: Ib1eaabc83e59c75a7610ba214b81e50aa4984baa Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add private header warningKai Koehne2015-07-2430-0/+330
| | | | | Change-Id: I95ae03b34631f166d2eed68e20282eb624ff408a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Unify Copyright headersKai Koehne2015-07-2420-109/+109
| | | | | Change-Id: I4cc145311cb41576d6f166ad4ddc085eeccc1650 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use v8 backend for proxy resolutionKai Koehne2015-07-233-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | Use the v8 proxy resolution backend instead of the native one in the multi-process case. This fixes a particular issue on windows where the winhttp one will attempt to find proxy servers for every single request: https://crbug.com/40797 . Chrome uses the v8 backend too. Resort to the native backend though if started with --single-process. This is because the Chromium renderer and the V8 ProxyResolver can't run in the same process. See also proxy_resolver_v8.h: // It is important that *ALL* instances of V8 in the process be using // v8::Locker. If not there can be race conditions between the non-locked V8 // instances and the locked V8 instances used by ProxyResolverV8 (assuming they // run on different threads). // // This is the case with the V8 instance used by chromium's renderer -- it runs // on a different thread from ProxyResolver (renderer thread vs PAC thread), // and does not use locking since it expects to be alone. Task-number: QTBUG-44763 Change-Id: I7b48cb9d0f3c41fdddffc9eb9f51d83442d80622 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Remove misleading warning about WebEngineProcess fallback pathKai Koehne2015-07-221-18/+28
| | | | | | | | | | | | | | | Remove the warning, and make the logic more predicable & in line with the rest of Qt: * If QWEBENGINEPROCESS_PATH is set, always use it. Assert if the file is not there. * If this is a OS X Framework, only look into QtWebEngineCore.framework, else * check QLibraryInfo::LibraryExecutablesPath * check applicationDirPath() Change-Id: I820388fbfb9e810314f353c9bbe38a471793aebc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use QCoreApplication::libraryPaths for pluginsKai Koehne2015-07-221-10/+15
| | | | | Change-Id: I7c926ca93c3bd05d60642d444742247fb8634740 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Search for .pak files also in applicationDirPath()Kai Koehne2015-07-221-13/+3
| | | | | | | | | | | Use libraryDataPath() for locating .pak files. This will fall back to QCoreApplication::applicationDirPath() if the Qt installation directory is missing. Task-number: QTBUG-42083 Change-Id: I96d940bd12024c308348fe3f5fa9fd259e2ac904 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Added \qtvariable to enable QDoc include QT += info.Venugopal Shivashankar2015-07-206-5/+7
| | | | | | | | Also added \since info. for some of the classes. Task-number: QTBUG-47274 Change-Id: Id8cfbd6d0e5b5826ceaebb008a453cd1c216a921 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* enable RTTI for MSVC buildJoerg Bornemann2015-07-141-0/+3
| | | | | | | | | | | | | QtWebEngine creates objects of subclasses of QSGGeometryNode. QtQuick2DRenderer uses dynamic_cast to determine which subclass it encounters when visiting the scene graph. When QtWebEngine is build without RTTI support, dynamic_cast crashes in QtQuick2DRenderer. Change-Id: Idb87aad0a7d39e7d386e76923d8b7b2cf19ef7e2 Task-number: QTBUG-47016 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Cleaned up the module overview.Kavindra Palaraja2015-07-141-33/+12
| | | | | | | | Polished the brief and some sentences in the module overview to improve readability. Change-Id: I35964880214ecd61859094b0ea7e318ff3e53fa6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix single-process modePeter Varga2015-07-143-1/+25
| | | | | | | | | | Destroy RenderprocesHostimpl first then the WebEngineContext. RenderProcessHostImpl's destructor may use the default BrowserContext stored by the WebEngineContext. Task-number: QTBUG-45722 Change-Id: Ide8875a89bd339ecf65ddd32a5f00842102c1c43 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add 200 percent image resourcesKai Koehne2015-07-146-20/+74
| | | | | | | | | | | | | | | | | Move out the resources intended for 100% scale factor from qtwebengine_resources.pak into a separate _100p.pak, and add also a _200p.pak. This fixes crashes and artifacts on Windows with high-DPI setups. [ChangeLog] qtwebengine_resources_100p.pak and qtwebengine_resources_200p.pak have been added alongside qtwebengine_resources.pak. Depending on the target environment either one or both have to be deployed. Task-number: QTBUG-47018 Change-Id: I1f305ada3ca4e4ae356276a59e0e92c94cca2d3f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix non-ANGLE buildJoerg Bornemann2015-07-081-0/+5
| | | | | | Task-number: QTBUG-47058 Change-Id: Ia695d78bfba90fc31f598582032fceb6fda83e79 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Do not set meta modifier twiceAllan Sandfeld Jensen2015-06-291-2/+0
| | | | | | | | We were setting the meta modifier twice. This breaks CTRL short-cuts on OS X since it may cause both CTRL and Meta to set. Change-Id: Ia4fa229b5b466235207afbe4a27a8078b3b2c876 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix warning and assertion on OS X and WindowsAllan Sandfeld Jensen2015-06-291-1/+1
| | | | | | | | We should not try to write to the selection clipboard on platforms where selection clipboards are not supported. Change-Id: I05a4e5a5181c0a2cd83f115e3181902a1e349ed0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Polished the module overview.Kavindra Palaraja2015-06-271-8/+7
| | | | | | | | Simplified sentences in the Architecture section to improve readability. Change-Id: I324a95caf811c0c8afe14c90fe10529999e3c538 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into ↵Liang Qi2015-06-2612-35/+216
|\ | | | | | | refs/staging/5.5
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-2612-35/+216
| |\ | | | | | | | | | Change-Id: Ie9373d6278c9ba1514de5640802d985ec35aceb2
| | * Use system fontconfig on embedded linuxv5.5.0Andras Becsi2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since our reference platform provides fontconfig on the system we can use that instead of the bundled one. This prevents us from duplicating the fontconfig cache which might also result in a very long first startup time. Change-Id: Ida74651a0d73ac7631cb5b60c0ced5998e59bc8c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Add documentation for QWebEngineScript and QWebEngineScriptCollectionPierre Rossi2015-06-122-3/+172
| | | | | | | | | | | | | | | Change-Id: I494f31a6b4efc038a96ca68142fa2f9a56d53802 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * WebEngineView: add a doc entry for settings.Pierre Rossi2015-06-121-0/+9
| | | | | | | | | | | | | | | | | | | | | Appears to be an oversight. The settings class itself is documented. Change-Id: Id768a61957c6cd77a5dd15698ce77754399d9199 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Last minute API review cleanupPierre Rossi2015-06-126-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | The getters in QWebEngineDownloadItem were not const. The script collection in QWebEngineProfile was passed by reference, which is not idiomatic of Qt. Change-Id: I9b4218b407288b91a726a711bd2a7e1c1167d99a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Add license file and mention in the docs for GPLv2+.Pierre Rossi2015-06-121-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I4fa625452228eda7aef97b3e4fb09d21bbdf6470 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Fix msvc linking issues caused by wrong export macroAndras Becsi2015-06-082-3/+3
| | | | | | | | | | | | | | | | | | | | | Use the correct export macro QWEBENGINEWIDGETS_EXPORT for widget API. Change-Id: I1fe61008938522548fe84936fd97e0458ada3104 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix crash when navigating an adopted windowAllan Sandfeld Jensen2015-06-261-0/+1
|/ / | | | | | | | | | | | | | | | | | | If the original opener has been closed, the factory client might point at a wrong object. To avoid that we can update it when we get the real client. It does not matter for CreateRenderWidgetHostViewQtDelegate which object it is called on. Change-Id: I7161e7436fca45c41f51cab8983d9c7214f11047 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | Fix cancellation of file dialogs.Joerg Bornemann2015-06-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user canceled a file dialog (e.g. provided by an input tag), then the renderer process would exit and the web page would turn blank. We must not pass empty strings or otherwise invalid file paths to RenderViewHost::FilesSelectedInChooser, because OnUpdateState will check for accessibility of those files and shutdown the renderer on failure. Task-number: QTBUG-46869 Change-Id: Ie01e56999c5e7acd42c5b3fd4993de7f3a5f2e73 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update snapshot SHA1Peter Varga2015-06-162-0/+1
|/ | | | | | | | | | The update contains the remove_v8base_debug_symbols change and enables it. This shrinks the debug library size even more. In case the symbols are needed CONFIG+=v8base_debug can be passed to qmake. Change-Id: I1a9e78163343257d76b7842ba592979db95b992a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update chromium branchAllan Sandfeld Jensen2015-05-261-0/+0
| | | | | | | | Pulls in the recent security fix. Change-Id: I1dac6591c11445619518334d530e9dd8d408a541 Task-number: QTBUG-46261 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add redirect and error API for custom URLAllan Sandfeld Jensen2015-05-136-2/+126
| | | | | | | Adds API for failing or redirecting custom URL requests. Change-Id: Ia633bff2c0b8484fd6fdb8d42982fda2e427db4c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update embedded configurationAndras Becsi2015-05-121-5/+2
| | | | | | | | | Remove some obsolete options and add conditionals similar to desktop_linux.pri. Change-Id: Id295345028e5fd5f593cbd0b5dc6acdb5c00518b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix Menu ui delegate after on__MenuClosed has been renamedAndras Becsi2015-05-126-11/+11
| | | | | | | | | | | The internal on__MenuClosed signal has been renamed to onAboutToHide in qtquickcontrols. Also update some import versions while we're at it. This patch also adds examples OSX application bundles to .gitignore which only contained the unix binaries. Change-Id: If1d91cb65987dda6d0e10794c1649b1b4e1ccde3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove unneeded ResourceContextQt::set_url_request_context_getterAndras Becsi2015-05-123-16/+3
| | | | | | | This is an ancient relic that can be removed. Change-Id: Ia6926fff65d0e4d0769de940516866a2c51d9a0c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Quick: Share profiles between application windowsSzabolcs David2015-05-072-1/+5
| | | | | | | | | | | | | | The applications should not create new WebEngineProfiles for each window, because the WebEngineView can not adopt content from a different profile when the target of the NewViewRequest is a new window (SHIFT+click) or a dialog. This also adds a notifier signal to the profile property in order to avoid "non-NOTIFYable" warnings. Change-Id: I235789f9bfa1a216f99592204e50266242d0ef1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Improve thread safety and behavior of custom URL requestsAllan Sandfeld Jensen2015-05-063-8/+75
| | | | | | | | | Adds thread protection between the UI and IO threads access to the QIODevice, and changes it to a QPointer, so we can tell if the user deletes it. Change-Id: I3e7b3f682d4c5a145d75cd5822affcfc9012cff7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add documentation of Custom URL requestsAllan Sandfeld Jensen2015-05-062-0/+67
| | | | | | | | | | Adds basic documentation to the API. Though the API is still private we would like people to experiment with it, which is easy if it is documented. Change-Id: I63985dfc16dc91270d95edf6fc306f9c71a10f29 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
* Fix crash when updating a storage context with active requestsAllan Sandfeld Jensen2015-05-061-0/+12
| | | | | | | | | | Requests keep pointers to objects owneded by the storage context such as the SSL context handler and HTTP cache. This means we must stop all requests before destroying the context, otherwise the requests will access deleted data. Change-Id: I67863287b3ffb470c8d84ff6cac143493998a6da Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Prevent conflicting declaration errors of GL typedefsv5.5.0-beta1Andras Becsi2015-04-303-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including gpu/command_buffer headers in Qt code pollute by including ui/gl/gl_bindings.h which pulls in system GL headers. This will cause conflicting declaration of typedefs when included together with content/gpu and content/common/gpu headers which pull in gles2_cmd_format.h that forward declares some GL types. Although the gl_bindings.h header states in a comment that it should only be included in source files, the inline implementation of texture_manager.h and some other low-level GL integration headers nonetheless require gl_bindings.h, which unfortunately cascades through to our core layer and may cause problems when Qt code is compiled. Since getting rid of this include in Chromium's headers is not feasible due to maintenance costs, making sure that in Qt code gpu/command_buffer headers are included before content/gpu and content/common/gpu headers and guarding forward declarations in gpu/command_buffer/common/gles2_cmd_format.h should be a sufficient workaround. We can however get rid of the polluting includes in src/core/gl_surface_qt.cpp, which only requires forward declarations. This also includes a SHA1 update for the Chromium submodule. Task-number: QTBUG-44240 Change-Id: I5813a3663d36e2b565e4fd7f429add7b6f8f8a69 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove Q_UNREACHABLE from DesktopScreenQt::GetDisplayNearestWindowSzabolcs David2015-04-301-1/+2
| | | | | | | | Chromium uses this method when the user attempts to drag. Task-number: QTBUG-45723 Change-Id: Ibe3946846f0f4e2d2a25ca36e66fa7235d4aecea Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix prefix buildPeter Varga2015-04-292-4/+4
| | | | | | | | | | | Deploy resources, locales, icu and plugins into the build directory instead of install directory. It is necessary when Qt is configured with -developer-build and -prefix options: the compilation may fail if user has no write access for install directory. Task-number: QTBUG-45796 Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Widgets: Use overridden show()Szabolcs David2015-04-272-4/+1
| | | | | | | | Notify client about the show() after RWHVQD creation. The WasShown(...) hack is not necessary anymore in the core layer. Change-Id: I221b2d027ee83d81d70191419bc4fa8d41231674 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Cleanup some Blackberry legacy code.Pierre Rossi2015-04-231-38/+5
| | | | | | | The blackberry-specific location is dead code by now. Change-Id: I1321c0fb3ea5cd99e513c2fff11724aa92a19cdd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Remove unused includesPeter Varga2015-04-231-3/+0
| | | | | Change-Id: I87de823c9a67f4e30dd9a86b185bfde51b934509 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Force to use English language for QML auto testsPeter Varga2015-04-235-2/+27
| | | | | | | | | | Moreover, localization setting via QtWebEngine is fixed. System localization setting can be overridden by --lang command line argument. Task-number: QTBUG-45715 Change-Id: I39f3a891e55ee47a57afc394e849ea02b0c76ad5 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>