summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix assert on exitAllan Sandfeld Jensen2015-09-103-0/+8
| | | | | | | | | | Remove frame loading error-page when frame is deleted, and make sure WebContents is destroyed before the observer so the observer can observe the full live-span including deletions.. Task-number: QTBUG-47945 Change-Id: I56bec611b8bfbfc6f75a1bc2108efbc80a81729b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-092-2/+2
| | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update WebEngineView documentationKai Koehne2015-09-072-35/+98
| | | | | | | | | | | | | | The split suggested in the comment does not work: You have to keep the complete documentation for a QML type in one file, the documentation bits in qquickwebengineview.cpp were silently ignored so far. This change moves over the bits from .cpp , adds missing documentation for new elements and sanitizes the output of others. Task-number: QTBUG-47909 Change-Id: Ie1ebb5a9fe952c7a76c8fe1b67135614ca90ce7a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Break destruction cycle between DownloadItem and WebEngineProfileKai Koehne2015-09-044-7/+14
| | | | | | | | | | | | | | All QQWebEngineDownloadItem objects are destructed as child objects of QQWebEngineProfile. However, they try to 'call back' to the already half-destructed QQWebEngineProfile object to unregister themselves. Avoid this by tracking the lifetime of the QWebEngineProfile with a QPointer. Task-number: QTBUG-48088 Change-Id: Ie6a76440ad9f37d7cbc38b4ce35bf5da785d0e2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix includeJoerg Bornemann2015-09-031-1/+1
| | | | | | | | The global include must either be prefixed with private/ or locally included. Change-Id: I7933d940bdddae4975db8e58fe52a887adec51ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update Chromium for cherry-picked security fixesAllan Sandfeld Jensen2015-09-031-0/+0
| | | | | | | | Includes fixes for CVE-2015-1284, CVE-2015-1290 CVE-2015-1291, CVE-2015-1292 and CVE-2015-1294. Change-Id: I6c51978452ebcf079dab75804560c5d0eafa81b1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: edit WebEngineProfile docsLeena Miettinen2015-08-281-55/+43
| | | | | Change-Id: Ifdfb36206c31215687f913e6887c8f9125487cf1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update submodule for ICU fixAllan Sandfeld Jensen2015-08-281-0/+0
| | | | | | | Pulls in the ICU overflow fix. Change-Id: I898bd9701b1c2df4eb55b11ee82eb7bab494af89 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: edit QWebEngineDownloadItem docsLeena Miettinen2015-08-281-15/+16
| | | | | | | | Use same wording as for the QML type, where appropriate. Change-Id: Idb10f054f334056713bf902c68e567c70fe150f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: edit QWebEngineCertificateError docsLeena Miettinen2015-08-281-2/+3
| | | | | Change-Id: I147f7e3da41804f7b28e08647a0b6d1756394e4f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: edit WebEngineNewViewRequest docsLeena Miettinen2015-08-281-8/+7
| | | | | Change-Id: I6597ce1b1bbb8a59f7852ee79c199c5774fc65b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: edit WebEngineLoadRequest docsLeena Miettinen2015-08-281-8/+10
| | | | | | | | | | - Add missing documentation - Replace "class" with "type" - Use standard phrasing - Edit for grammar and style Change-Id: I35bcb3c84e87257d56ee5d89847f8ecf302b205b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: edit WebEngineDownload docsLeena Miettinen2015-08-271-34/+17
| | | | | | | | | | - Use the \value command for enum values - Use standard phrasing for property docs - Edit grammar and style Change-Id: Ia4cc6db4478264aeb87772088fdd58890423ee20 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Fix see also linkKai Koehne2015-08-271-1/+1
| | | | | | | qquickwebenginecertificateerror.cpp:61: warning: Can't link to 'WebEngineCertificateError::certificateError' Change-Id: I436388a2cf24edaf159942e964b480b877907de2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Mark properties/slots new in Qt 5.5 to be only available in 1.1Kai Koehne2015-08-271-3/+3
| | | | | Change-Id: Ib36ee2849616461b4214c912cde6b5c7a758b68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix Q_PROPERTY declaration in QQuickWebEngineDownloadItemKai Koehne2015-08-271-1/+1
| | | | | | | | qquickwebenginedownloaditem_p.h:74: warning: Failed to parse token ( in property declaration Change-Id: I4d9bb4eed5f6fbcc4b81fdad94577f9f06daca39 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update .qmltypes fileKai Koehne2015-08-272-7/+779
| | | | | | Change-Id: I2c3e529e79e3e0591abcfff922191cb3dc35f00a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix documentation to advertise QtWebEngine 1.1 importKai Koehne2015-08-252-4/+4
| | | | | Change-Id: I0f275c3228c44c3d2e081160653dd3e466c52596 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: clean up QWebEngineSettings docsLeena Miettinen2015-08-243-79/+84
| | | | | | | | | | | ... and the corresponding QQuickWebEngineSettings docs - Add missing documentation - Remove references to obsolete classes - Edit for grammar and style Change-Id: I368fff274609941d6435ddf3343b81bca6013945 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Qt Quick Menu: Delay destroying the menu instanceGabriel de Dietrich2015-08-181-1/+10
| | | | | | | | | | | This is necessary on Mac, where we use native menus and, in order to support catching exceptions emitted from menu handlers, we queue the 'triggered' signal emission (see qtbase commit 08cc9b9991ae9ab51). This also means that the 'done' signal is emitted before we get a chance to receive the menu item's 'triggered' signal, resulting in a noop. Change-Id: Ie5f06521fb1cdd5def1517a908078c1dd62ab0d0 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 23:54:09 +0000