summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.14' into wip/qt6"wip/qt6Liang Qi2019-09-12129-1374/+4351
|\
| * Merge remote-tracking branch 'origin/5.14' into wip/qt6Liang Qi2019-09-12129-1374/+4351
| |\ |/ / | | | | Change-Id: Ida28f81014758a4b164a7ddc958b3ba5afc74c79
| * Remove usages of deprecated APIsSona Kurazyan2019-09-0914-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced the following deprecated APIs: QWebEngineProfile::setRequestInterceptor -> QWebEngineProfile::setUrlRequestInterceptor QWebEngineSettings::globalSettings -> WebEngineSettings::defaultSettings QLayout::setMargin -> QLayout::setContentsMargins QWheelEvent::{x, y} -> QWheelEvent::position QWheelEvent::{globalX, globalY} -> QWheelEvent::globalPosition QSysInfo::windowsVersion -> QOperatingSystemVersion::current Qt::InputMethodQuery::ImMicroFocus -> Qt::InputMethodQuery::ImCursorRectangle QDesktopWidget::screenGeometry -> QGuiApplication::primaryScreen::geometry QTime -> QElapsedTimer - Fixed the tests to compile when deprecated APIs are disabled. - Replaced the doc references to deprecated APIs with the new ones. Made the docs for deprecated APIs compile conditionally, based on deprecation version. Task-number: QTBUG-76491 Change-Id: I5c6b7c628957deb9163f0bd2b6bc31bde1c7daec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Blacklist several Qt WebEngine quick dialog tests on macOS 10.13Michael Brüning2019-09-091-0/+6
| | | | | | | | | | | | | | | | | | These tests are causing frequent failures on macOS 10.13 in the CI, but are not reproducible / debuggable when not running as part of CI. Task-number: QTBUG-76549 Change-Id: I1b105748c9fad8a6104beeccb10632518893d06b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Lower requirement for glibc to 2.17Allan Sandfeld Jensen2019-09-091-3/+3
| | | | | | | | | | | | | | | | | | This was not correctly merged from 5.13 due to the check moving to another file. Task-number: QTBUG-77171 Change-Id: I4388ea9a58509c93574d7953eebb09a62b5ffd63 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Move gn configs out of coreMichal Klocek2019-09-077-4/+4
| | | | | | | | | | Change-Id: Ib047e35191faa627211c759bff4e81bfaec3d685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move main configure and move some tests from core to buildtoolsMichal Klocek2019-09-0712-751/+735
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing configuration for gn when building qpdfcore module will require optional libraries resolved. Some libs are not needed, but this requires extra patching of gn build configs; so to keep things simple, just detect all the libs beforehand. Unfortunately using this for main configure goes bonkers. The issue here is that main configure resets features in global scope, which can break features coming from qtbase and results in bogus configurations in certain cases. Therefore move current configuration to buildtools and make everything else depend on this. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add jumbo builds to configure systemMichal Klocek2019-09-073-6/+49
| | | | | | | | | | | | | | | | | | | | Adds new feature webenigne-jumbo-build which indicates merge limit for jumbo build, usage: qmake <src> -- --webengine-jumbo-build=8 Change-Id: I7607a83772b53f6db57eb12559989a91f991ce93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add webengine-core featureMichal Klocek2019-09-0716-388/+543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create/split main configure for submodules. Now configure system knows when webenginecore module is not going to be built and the user gets the feedback after the configure step with the message: The following modules are not being compiled in this configuration: webenginecore webengine webenginewidgets If a module is not built also features are not populated, therefore some tests have to be moved to main configuration. This improves error reporting and prepares landing for QtPdf modules. Remove configure.prf and fix issues after config split. Add makefile call to report errors. Now calling make also reports issues. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I76944df4c5db6f4954c464e3741a8054cb10b40e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Blacklist tst_QWebEnginePage::fullScreenRequested on WindowsAllan Sandfeld Jensen2019-09-061-0/+3
| | | | | | | | | | | | Task-number: QTBUG-78015 Change-Id: I9d1e2409897df6d5a36ab9a12d42224c2163df6b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Api to get certificate's chain on errorKirill Burtsev2019-09-0511-88/+147
| | | | | | | | | | | | | | | | | | | | | | | | Expose certificate's chain on validation error starting with the immediate certificate and ending with the CA's certificate. [ChangeLog][QtWebEngineWidgets][QWebEngineCertificateError] New method to get the peer's chain of digital certificates. Fixes: QTBUG-51176 Change-Id: I799dfe9e44f9f2517f4691d175beee256114af79 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Allow deferring QWebEngineCertificateError handlingKirill Burtsev2019-09-0516-45/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduce defer() method for halting URL load on certificate errors, and methods for rejecting and ignoring these errors subsequently in async manner. [ChangeLog][QtWebEngineWidgets][QWebEngineCertificateError] New methods for asynchronous decision on certificate error during load. Fixes: QTBUG-55110 Change-Id: Ib23eb568862ccc360208922a6a581f8e7edc4a7e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix tst_QWebEngineScript::loadEvents()Tamas Zakor2019-09-051-29/+54
| | | | | | | | | | | | | | | | | | | | If the page load takes more than 500ms the Deferred injection point will be triggered before the load finish event. Fix the test to handle this situation. Change-Id: If6ad9250127650630ef96c35c79ce6bfe73ecf95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-0451-182/+2641
| |\
| | * Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-0451-182/+2641
| | |\ | |/ / | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I89e81a2d285e57eaf29e8cfef4abaf458b352c3b
| | * Introduce findTextFinished signalPeter Varga2019-08-2327-21/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a replacement for the callbacks. Also introduces QWebEngineFindTextResult class what is common for the Quick and Widget APIs. This makes possible to provide extra information about the match, eg. the number of matches and the index of the currently highlighted match. [ChangeLog][QtWebEngine][WebEngineView] Introduces findTextFinished signal and FindTextResult type to provide extra information about the result of a text search. [ChangeLog][QtWebEngineWidgets][QWebEnginePage] Introduces findTextFinished signal and QWebEngineFindTextResult class to provide extra information about the result of a text search. Task-number: QTBUG-50420 Change-Id: Icb9737d2f596e6bc0fc5733144eeeaf2a77aab02 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Refactor findText handlingPeter Varga2019-08-2213-106/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move most of the findText logic to the QtWebEngineCore::FindTextHelper class. This change also separates findText callbacks in the new class for getting rid of the request ID conversion and make it easier to remove them in Qt6. Task-number: QTBUG-50420 Change-Id: I348cedd0f90a49f9b360165c46319aeed2c236c0 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Use ui::CompositorJüri Valdmann2019-08-2220-32/+1573
| | | | | | | | | | | | | | | | | | | | | | | | Needs corresponding 3rdparty change. Fixes: QTBUG-71885 Change-Id: I791bc3da5a7a66e03470e9e05bf25a997101b018 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Use RenderFrameMetadata for scroll position and contents sizeJüri Valdmann2019-08-223-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for using viz display compositor since SubmitCompositorFrame will not be called any more. Also move the loadVisuallyCommitted call to the Compositor's callback. Task-number: QTBUG-71885 Change-Id: I062b3466671cc6af35877f2ff6995ea290cdf9de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fix warning about extra semicolon for Q_DECLARE_FLAGS statementMichael Brüning2019-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Reduces the number of warnings a bit more. Change-Id: I0da60354758f494fd32be08a2db8600d56e2ac92 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Doc: Mark QWebEngineDownloadItem::setPath() obsoleteLeena Miettinen2019-08-301-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | Mention the functions that replace the obsolete path() and setPath() functions and fix QDoc issues in their docs. Change-Id: I3497113760386e54e397bbe9c2149c355c22a3ec Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Doc: Edit docs for QWebEngineUrlRequestInfo::initiator()Leena Miettinen2019-08-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixed the grammar and added \since 5.14. Change-Id: Iab9b4898c761366f640300445aa21913523a58e2 Reviewed-by: Tamas Zakor <ztamas@inf.u-szeged.hu> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Doc: Describe QWebEngineUrlRequestInfo::ResourceTypeNavigationPreloadLeena Miettinen2019-08-271-1/+3
| |/ | | | | | | | | Change-Id: Ifbcfc6313914883a8e2566399a009ae449fface3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * WebContentsAdapter: don't use toStrongRef().data()Marc Mutz2019-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's an anti-pattern. Even though we don't expect other threads to destroy the last QSP while we use the pointer obtained from QWeakPointer, play it safe and use QWeakPointer idiomatically: as a non-owning reference, to be converted to an owning one for the duration of our use of the payload object. Amends 7cade5688f6a0bde067dc496cedcb8de14662116. Change-Id: Ib1c136569c27f413a4a78bfc35784032c53522a9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Move winversion test to configureMichal Klocek2019-08-153-41/+8
| | | | | | | | | | Change-Id: I5e0544415298b0e6b10e55f91d93d05eef81ccc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move re2 test to configureMichal Klocek2019-08-153-47/+16
| | | | | | | | | | Change-Id: I76aa5c544a5930982e1d1b0ed28a75e88ec65e48 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move khr test to configureMichal Klocek2019-08-153-42/+8
| | | | | | | | | | Change-Id: Ic213555705f12a46283c62410bf9a477f03c05c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move libvpx test to configureMichal Klocek2019-08-153-51/+16
| | | | | | | | | | Change-Id: I669b9d4cc28765b134386752d1fc14d14fa5b1dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move snappy test to configureMichal Klocek2019-08-153-45/+14
| | | | | | | | | | Change-Id: I585e7f9aa19d03ca164e9419e55997526aeaca86 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Move xml2,glibc test to configureMichal Klocek2019-08-155-98/+24
| | | | | | | | | | Change-Id: I047f04a48d489730922093a9929e3609524dd06f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Use QWeakPointer::toStrongRef().data() to get the raw pointerMichael Brüning2019-08-141-1/+1
| | | | | | | | | | | | | | | | Fixes a deprecation warning because QWeakPointer::data is deprecated from 5.14 onwards. Change-Id: I09b356b172cb9ffef880d6b97b4c6a9646203942 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Fix typos in header guardsMichael Brüning2019-08-131-3/+3
| | | | | | | | | | | | | | | | | | Those must have slipped through review and CI, but the compiler warned about them. Change-Id: I5f3e7d36ccc66c14b8be20f2499df9aa7a6813e1 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix missing semicolon in tst_qwebengineprofile.cppJüri Valdmann2019-08-131-1/+1
| | | | | | | | | | Change-Id: Iaf4e0acf2097308fe988350a10441c7313cb2bb3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move alsa test to configureMichal Klocek2019-08-123-45/+14
| | | | | | | | | | Change-Id: Ifdd476c0b58763be009d208a5f9d4c23305b6baa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Add webenginewidgets to configure systemMichal Klocek2019-08-125-20/+45
| | | | | | | | | | | | | | | | Make webeninge-qml webengine-widgets features indpendent of webenginecore. Change-Id: I11c1bfaf4a15e4cb3acf2751b367f2c92a7ac833 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Port from QMutex::Recursive to QRecursiveMutexMarc Mutz2019-07-313-24/+37
| | | | | | | | | | | | | | | | | | | | | | Also port from QMutexLocker to std::lock_guard, as the former will not support QRecursiveMutex going forward. Add a guard for Qt < 5.14 to fall back to the old implementation, as this module has to compile against the latest LTS, too. Change-Id: Ib247135326ed199fd5fc783e906e7e3018687570 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix quick download directory auto test on WindowsTamas Zakor2019-07-281-10/+11
| | | | | | | | | | Change-Id: Ib4668e5a21d9062ea3b1b760aec319aa9c7fdbd8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix Qt6 buildAlexandru Croitor2019-08-137-270/+21
| | | | | | | | | | | | | | | | | | | | | | | | Fix Qt 6 incompatible source usages. Also bump version. Also make sure in a framework build, the process executable is placed under the correct major version directory. Also remove the ABI compatibility fixes that we did for malloc symbols and friends. Change-Id: Ie26f660502a20afd2a79334c9b4f07d9a14a1ed3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Alexandru Croitor2019-07-2543-155/+413
|\ \
| * \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-07-2543-155/+413
| |\ \ |/ / / | | _ | | Change-Id: Id99556759fb99001f1c336bc06923221cdffbb29
| * Merge "Merge remote-tracking branch 'origin/5.13' into dev"Allan Sandfeld Jensen2019-07-2424-73/+217
| |\
| | * Merge remote-tracking branch 'origin/5.13' into devAllan Sandfeld Jensen2019-07-2424-73/+217
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_chromium.pri tests/auto/quick/qmltests/BLACKLIST tests/auto/quick/qquickwebengineview/BLACKLIST tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tests/auto/widgets/qwebengineview/BLACKLIST Change-Id: I11b26f5eebde29c4c62247b90e11e3ae40789fe4
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Allan Sandfeld Jensen2019-07-2314-41/+118
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-07-2314-41/+118
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/config/common.pri src/core/configure.json src/core/net/url_request_qrc_job_qt.cpp src/core/ozone/surface_factory_qt.cpp src/core/web_contents_adapter.cpp Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
| | | | * Fix use-after-free in WebContentsAdapter::loadJüri Valdmann2019-07-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass WebContentsAdapter pointer to lambda via QWeakPointer in case the adapter has been deleted already. Fixes: QTBUG-76958 Change-Id: I1962ba3dd1794a27e7013a2ad1b729fe7a08c079 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * Reset findText reply id on StopFinding to prevent callback laterKirill Burtsev2019-07-164-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not updating lastReceivedFindReply caused next findText call after StopFinding to trigger redundant callback call on checking stale query. Fixes: QTBUG-77029 Change-Id: Iad4b71364ecb3ec3db3096b739e77620d12731f9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | | * Remove qt.io load from findTextInterruptedByLoad and ensure checksKirill Burtsev2019-07-161-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load of real website is not really needed, simple html is enough to verify that on load no findText callback is executed from previous query. Ensure callback is not called with timeout and additional check inside it to verify that it's not called twise. Task-number: QTBUG-75541 Change-Id: Iebf207e40d8f4d4f680b46bb0f32480edd72f36d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | | * Fix quick dialog test wrong message on view's LoadStatus changedKirill Burtsev2019-07-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8eb671409794799bcdad4760dc58e84de3b109f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | | | * Fix spellcheck test flaky failure with misspelled word missingKirill Burtsev2019-07-121-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work is done asynchronously by chromium SpellChecker object. Therefore there is no guarantee that on ShowContextMenu event for WebContents there will be a result with misspelled word. Change-Id: I2978ed99e4c14f0a7d9086853c5218f82ea1ab60 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | | | * Do not proceed with uninitialized resourcesMichal Klocek2019-07-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRC files can be optimized with CONFIG+=qtquickcompiler and removed, in that case 'size' of resource is zero. Do not process 'empty' resources. Throw warning. Fixes: QTBUG-76403 Change-Id: If21ff698e7985f82e6456500d4d24cb366cff012 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
View Lorry Controller Status