summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix python version checkJoerg Bornemann2015-10-061-5/+12
| | | | | | | | | | | | | | The python code that is used to determine the version number did not work with python3. In python3 print is a real function and must be called as such. Use positional accessors to be compatible with python < 2.6. Also extend the error message for users that attempt the build with python3. Task-number: QTBUG-48507 Change-Id: I49e1fb77c2cc421ac1faed8d8143bf605fbde700 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Parse suggested filename from content-dispositionAllan Sandfeld Jensen2015-09-301-0/+4
| | | | | | | | | Chromium hasn't parsed content-disposition by the time we get the download item, so we need to call the parsing manually. Change-Id: I105d0c6904dd764b368cb774e377a6028c082513 Task-number: QTBUG-48206 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5.1' into 5.5Allan Sandfeld Jensen2015-09-241-0/+47
|\ | | | | | | Change-Id: I003fe50e0ed39ba3e551543b1a43eb3e884500dc
| * Add changes filev5.5.1Allan Sandfeld Jensen2015-09-231-0/+47
| | | | | | | | | | | | | | List the most relevant changes Change-Id: I8556f2081d6e88572f1a5ffa694d561d6986c3cb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix httpUserAgent setting after the view's initializationSzabolcs David2015-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | Set user agent override on all WebContents of the specific BrowserContext. Task-number: QTBUG-47976 Change-Id: I4fc6f8d79aff6f372ca48d82642b3eab60f933d1 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Link with -ObjC to have ObjC categories workingAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | | | If we don't link with ObjC, categories as used by Blink will not work and cause crashes at runtime when failing selectors. Change-Id: I81520cc46ed996377b86760232bc99e275e48ff3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix metaobject signature of QWebEngineDownloadItem::stateChangedJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | We need to fully qualify enum parameters in signals/slots for the meta-object system. Otherwise the old QObject connection syntax will not work. Task-number: QTBUG-48309 Change-Id: I7a99d8a924ed3566c410c1c0ee7392e863fb2030 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
|/ | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* 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-094-5/+10
| | | | | | | | | | 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>
* Add tst_geopermission QML test caseAdam Kallai2015-09-013-0/+133
| | | | | Change-Id: Icfb74f3ef8b0745d3fc0a7335f8344960a74fa0b Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* Update the expected list of public API testcaseAdam Kallai2015-08-271-0/+1
| | | | | Change-Id: I5cec5789149e3a9ed8b6752646f1879bb3dd56aa 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>
* Add the GPLv3 license textThiago Macieira2015-08-132-0/+698
| | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@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>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Oswald Buddenhagen2015-07-230-0/+0
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-200-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty Change-Id: I76d1c39c93cd45786cf95f9f010e7cee118f8887
| | * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-251-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I837d349b9ee508be3ebf9990b0ad039a53341b77
| | | * Update chromium branchv5.4.2Allan Sandfeld Jensen2015-05-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the recent security fix. Change-Id: I1dac6591c11445619518334d530e9dd8d408a541 Task-number: QTBUG-46261 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * | Bump versionOswald Buddenhagen2015-04-201-1/+1
| | |/ | | | | | | | | | Change-Id: I9e0f98316bc1ba4fd5ee73c6991e4599704e3317
* | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 02:02:49 +0000