summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use fixed qt_add_resource BASE argumentPeter Varga2021-05-281-0/+3
| | | | | | Task-number: QTBUG-86726 Change-Id: I33ec2a73254d9b44de83f4f5491f372b4bb9959b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix generating webrtc logging resources with cmakePeter Varga2021-05-271-1/+8
| | | | | | | Also disable webrtc logging test if extensions are disabled. Change-Id: I49c8d4fb6049c9aed174f62f731b0f56dae490ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add major revision to revisioned symbolsAllan Sandfeld Jensen2021-05-268-126/+124
| | | | | | | Should make imports of 2.0 include all of 1.x. Change-Id: Ibaf40d7e363524820dbd06356998ec780752717f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add support for top-level configs and developer buildsAllan Sandfeld Jensen2021-05-252-1/+23
| | | | | | | | | | Guess a toolchain link for top-level builds. Copy the resources to their final destinations, and search for the helper process where it is build in this config. Change-Id: Ie9e829c19d42dddb85df188e48ec269f85268ed4 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add missing dependecies, update shasMichal Klocek2021-05-253-3/+7
| | | | | | | | | | | Include WebChannel,Positioning cmake packages into WebEngineQuick and WebEngineWidgets. WebEngineCore depends on it so this should be pick up automatically, but in the case of clean build and due to how things work in cmake this is required otherwise linker genex will complain. Change-Id: I54fe8ffdb824e1fd0c0dcdfbbb43b1bcf06411bb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adapt to new QtPositioning APIPeter Varga2021-05-251-14/+7
| | | | | | | | | | | Use QGeoPositionInfoSource::errorOccurred after: ced55681 QtPositioning: rename signal error() to errorOccurred() Remove usage of QGeoPositionInfoSource::updateTimeout after: 37ff0744 QtPositioning: remove QGeoPositionInfoSource::updateTimeout signal Change-Id: I7a32173c017571e56ff9d58bf9398106b66f4feb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make handling of certificate errors possible from a signalAllan Sandfeld Jensen2021-05-254-7/+5
| | | | | | Task-number: QTBUG-74587 Change-Id: I9955a4c70b339523b5e9e9d6dffe928e61fbab90 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Switch builds to cmakeMichal Klocek2021-05-221-0/+14
| | | | | | | | | | | | | | | | | * move the sync profile, so we can sync headers for the libs project * update dependencies * add coin module config * extend timeout for build * bump version to 6.2 * disable qmake build by deleting the main pro file * tweak product dependencies, cheat and point to even not merged change Task-number: QTBUG-91760 Change-Id: I02d6cda3a4ce09575ae993836b5089e1655401b9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Revert "Look for resources in macOS standard Resources dir"Michal Klocek2021-05-221-2/+0
| | | | | | | | | | | This reverts commit 3a4e3c807c667491e133d04e3dcbadd0dad19826. With cmake we no longer install into capitalized directories, this went unnoticed for a while, till one of the mac coin nodes got the case sensitive file system. Change-Id: I8442ed6a3f02c37786ba7f98d891a1ddbbf10a2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2021-05-221-0/+0
| | | | | | | | | | | Pulls in following changes: * f80d7ed91c2 Add cmake link writer for specific configuration * e785a72d31a Fix gn build windows issue * 22968137276 Fix missing dependency for qtwebengine/browser/pdf Change-Id: I0cd5f003f84164b35dac437e0ca63e5d20f5010b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Clean headersMichal Klocek2021-05-224-4/+4
| | | | | | | Fix errors from the 'clean headers' task on coin. Change-Id: I058697e726228800c0fd3220b1d40ac154efb47c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix not working ninja multi config on coinMichal Klocek2021-05-221-27/+40
| | | | | | | | | | | | | | | | On coin we call cmake --build . and we do not specify the config expecting that all configuration are build. However, when using the custom command for ninja build dependencies are incorrectly resolved by cmake and the ninja step is only executed in "default" config context. This breaks debug builds. Cmake 3.20 fixes the issue by adding genex to OUTPUT and support for OUTPUT_CONFIG. Create workaround for now and revert it when minimum version of cmake is bumped to 3.20 Change-Id: Iafaedb5f605ed9195dd4ecaa34d2dff19b7225a6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add windows to the cmake buildMichal Klocek2021-05-2214-100/+142
| | | | | | | | Fix cmake for windows builds and add QtWebEngineSandbox target. Task-number: QTBUG-91760 Change-Id: If962a81ddfb509d104ad8ffbfbf34f1150ae82ce Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add mac builds to cmakeMichal Klocek2021-05-224-18/+84
| | | | | | | | | | | We need to pass -F or -iframework to gn as a compiler flag, however cmake keeps this parameter as include dir and adds internally "-iframework QtFoo.framework/.." for the compiler call. This internal handling can not be accessed with the genex. Add the manual conversion. Task-number: QTBUG-91760 Change-Id: Id12831432ccb0516be52f79bd5f6cfcbe7e87d9c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Refactor and create gn targetMichal Klocek2021-05-226-445/+557
| | | | | | | | | | | | | | | | | Refactor the gn handling and add: * the gn target for encapsulating resources needed to run chromium builds * the support for SOURCES, INCLUDES, DEFINES, COMPILE OPTIONS. * the multi config support for cmake and enable debug, release builds * CONDITION evaluation for the gn target and the gn arg list * the linux specific config and all missing source sets * use REALPATH instead of ABSOLUTE, this fixes missing drive letter on windows Task-number: QTBUG-91760 Change-Id: Ib283d8ab817ff36ee9c94c2b8f44785709c45258 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump the minimum required cmake version to 3.19Michal Klocek2021-05-224-4/+4
| | | | | | | | | | | QtWebEngine requires support of TARGET_PROPERTY for genex in gn template generation to dump all compilation flags. This is supported since version 3.19, set examples to 3.16 as rest of the qt. Task-number: QTBUG-91760 Change-Id: Ifa5903c8c6efcb160db05baf1e18c865b48bcf39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add WebEngineWidgets, WebEngineQuick modules cmake buildMichal Klocek2021-05-1927-45/+148
| | | | | | | | | Fix some library dependencies and make proper header includes in core. Task-number: QTBUG-91760 Change-Id: I415361dd42ef2cc39716ce3f5f56e6e8556ac4c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add QtWebEngineCore module cmake buildMichal Klocek2021-05-195-18/+294
| | | | | | | | | | | | | | | | | | | | | Create QtWebEngineCore, QtWebEngineProcess and drive headers sync from the libs project. Main project build should not generate any header files, since the logic in qtbase assumes fixed QT_BUILD_DIR, which is by default CMAKE_BINARY_DIR for prefix builds. Drive all syncqt calls from the libs project and leave the main build just for the feature evolution and the build summary reporting. This fixes header installation issues, however this patch requires also sync.profile update which is done later, to keep the qmake build still functional. Note this patch only adds debug builds for linux. Task-number: QTBUG-91760 Change-Id: I516c26206baa1cf6b966629a694dadce7f79dbec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-197-7/+107
|\ | | | | | | | | | | | | Conflicts: src/core/render_widget_host_view_qt.cpp Change-Id: I86113b13bb2d8419e9e9a485197f02b2c7399cd4
| * Set enumaration root directory for File.webkitRelativePath APIBalazs Egedi2021-05-131-2/+6
| | | | | | | | | | | | Fixes: QTBUG-93304 Change-Id: If2f30aab1c6a6eb81cfbad51318ec31adf5e96b6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix FilePickerController's path validation for windows and corresponding testsPeter Varga2021-05-121-2/+2
| | | | | | | | | | Change-Id: If2445171232864cb4ac51888ccc93bc00cb099a2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add support for Keyboard.getLayoutMap()Peter Varga2021-05-126-2/+98
| | | | | | | | | | | | | | | | | | | | | | Pulls in the following changes: Submodule src/3rdparty 6c7b4ffb..1d3b13e9 > 1d3b13e9634 Make clang to inline load/store atomic calls for YieldSortKey struct > f6730fe81a0 Enable XkbKeyboardLayoutEngine::SetCurrentLayoutByName for Qt Fixes: QTBUG-92971 Change-Id: I0c0cddfe4d3e25fd6d3f7e0764b302c300303172 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Follow InProcessGpuThread::Init() on thread priorityAllan Sandfeld Jensen2021-05-101-1/+1
| | | | | | | | | | | | | | If they use NORMAL, then we should too. Change-Id: I252b4606c692ba483434c126fcda3a7484f399e2 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Allan Sandfeld Jensen2021-05-1326-142/+153
|\ \
| * | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-1226-142/+153
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webenginewidgets/printme/printhandler.cpp src/3rdparty src/core/api/qwebenginepage_p.h src/core/content_browser_client_qt.h src/core/web_contents_adapter_client.h src/core/web_contents_delegate_qt.cpp src/core/web_contents_delegate_qt.h src/webenginequick/api/qquickwebengineview_p_p.h tests/auto/quick/qmltests/data/tst_download.qml tests/auto/quick/qmltests/data/tst_viewSoure.qml tests/auto/widgets/loadsignals/tst_loadsignals.cpp tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be
| | * Remove tracking of frame which load error pageKirill Burtsev2021-05-062-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added to suppress progress notification for error page load after failure, but since error page load is reported as a new navigation (which clears list of tracked frames), it was actually doing the opposite thing. The only situation where it suppresses progress is when navigation was not finished (due to invalid domain or network error), but in this case it was real progress change for whole load which should propagate further. Change-Id: Ifd1d681fb5c6495fb3afdc4247364afb4472c959 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Fix inconsistent number of load signals and their orderKirill Burtsev2021-05-068-86/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change tries to match how chromium treats one single load. Before the pair of loadStarted/loadFinished methods for api classes was called on delegate's DidStartNavigation/DidFinishNavigation, which might be many within one single logical load. This is true for multiple usecases (like multiple redirects on load, immediate form submit on DOM load, page's subresource load, or just an error page load on failure). Tracking these methods and deciding when to emit signals based on states are error-prone and complicates logic for no benefits. Also it somewhat lies about when real load is done, which is only started and finished on outer methods DidStartLoading/DidStopLoading, which are conveniently called only once for all mentioned usecases. So, this change uses these methods to issue signals for load start/finish, and only makes exception for error page, which is needed for quick's private test support. Fixes: QTBUG-65223 Fixes: QTBUG-76802 Fixes: QTBUG-87089 Fixes: QTBUG-90342 Fixes: QTBUG-91773 Fixes: QTBUG-92063 Change-Id: I9cc99b639030fedd8cf6a9dc04d0869d6be6357d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Doc: Add a note about navigation within a page to a fragmentKirill Burtsev2021-05-061-0/+6
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76802 Change-Id: I38cd148706c0479ffbad1e0d2877adc1cad9038d Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Allow leaving OCSP offAllan Sandfeld Jensen2021-05-033-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This form of OCSP is not good, so try to at least allow it to be disabled, until we remove it. Fixes: QTBUG-91467 Change-Id: Ied9e8c4960e6ea1503dea39ebbced2ad1af08d5d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Update ChromiumAllan Sandfeld Jensen2021-04-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 3f594ea1..6c7b4ffb: > FIXUP: Avoid crashing on new window in cross-origin isolated content > [Backport] Security bug 1198309 > [Backport] CVE-2021-21231: Insufficient data validation in V8 > [Backport] CVE-2021-21230: Type Confusion in V8 > [Backport] CVE-2021-21233: Heap buffer overflow in ANGLE > [Backport] CVE-2021-21227: Insufficient data validation in V8 > Avoid crashing on new window in cross-origin isolated content > Fix build with system ICU 69 Change-Id: Iab339abb1a34ce93e03f64608c6b5c5719f36fce Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Merge remote-tracking branch 'origin/5.15.4' into 5.15Allan Sandfeld Jensen2021-04-273-8/+7
| | |\ | | | | | | | | | | | | Change-Id: I659eb87245dfd59f014a7ca152c9f261ad400238
| | | * Update Chromiumv5.15.4-lts-lgplv5.15.4-ltsMichael Brüning2021-04-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty dd45b1a1..3f594ea1: > [Backport] Security bug 1155297 (3/3) > [Backport] Security bug 1155297 (2/3) > [Backport] Security bug 1155297 (1/3) > [Backport] Security bug 1192552 > [Backport] CVE-2021-21225: Out of bounds memory access in V8 (2/2) > [Backport] CVE-2021-21225: Out of bounds memory access in V8 (1/2) > [Backport] CVE-2021-21224: Type Confusion in V8 > [Backport] CVE-2021-21223: Integer overflow in Mojo > [Backport] CVE-2021-21222: Heap buffer overflow in V8 Task-number: QTBUG-92895 Change-Id: I9c5c3aa451d8a4cab018e23a6407fd0e1f7a58de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Update ChromiumMichael Brüning2021-04-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty c38ae3ec..dd45b1a1: > [Backport] CVE-2021-21209: Inappropriate implementation in storage (5/5) > [Backport] CVE-2021-21209: Inappropriate implementation in storage (4/5) > [Backport] CVE-2021-21209: Inappropriate implementation in storage (3/5) > [Backport] CVE-2021-21209: Inappropriate implementation in storage (2/5) > [Backport] CVE-2021-21209: Inappropriate implementation in storage (1/5) > [Backport] Security bug 1184441 > [Backport] Security bug 1162424 Task-number: QTBUG-92895 Change-Id: I04217fe2026d0087e4b7bd9bc6d5e8fcb5e25ebd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Update Chromium and adapt PermissionManagerQtMichael Brüning2021-04-203-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 6764c29f..c38ae3ec: > [Backport] Security bug 1190525 > [Backport] Security bug 1161759 > [Backport] Security bug 1175503 > [Backport] Security bugs 1175522 and 1181276 > [Backport] CVE-2021-21219: Uninitialized Use in PDFium > [Backport] CVE-2021-21217 and CVE-2021-21218: Uninitialized Use in PDFium > [Backport] CVE-2021-21214: Use after free in Network API > [Backport] CVE-2021-21213: Use after free in WebMIDI > [Backport] CVE-2021-21207: Use after free in IndexedDB > [Backport] CVE-2021-21221: Insufficient validation of untrusted input in Mojo > [Backport] CVE-2021-21204: Use after free in Blink. > [Backport] CVE-2021-21203: Use after free in Blink > [Backport] CVE-2021-21202: Use after free in extensions. > [Backport] CVE-2021-21201: Use after free in permissions Task-number: QTBUG-92895 Change-Id: I7e6f3d443366bb291cab027510f76788c14fc023 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Report server directs in navigation typeAllan Sandfeld Jensen2021-04-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A server redirect might not have been reflected in the navigation type at this point, so also check the is_redirect value. Fixes: QTBUG-92819 Change-Id: I711ef041de69552bc3485c9cf3db68c9e6033d6a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit b29b245fcb9db741d14180ea7e8dcb3ad2d4f49a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * | Docs: Suggest to use higher DPI for printingSzabolcs David2021-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When printing with the default resolution of QPrinter, rasterized images of pages are just too small to produce sharp result. Documentation of QPrinter also mentions that the default ScreenResolution should only be used for drafts. Change-Id: I5fe93f7985d16b1126cf2bbcb9b4a4ddbdfd21f2 Task-number: QTBUG-92185 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Fix application locales againSzabolcs David2021-04-217-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different countries (with the same language) can have different number formatting and navigator.language should report not only the language, but also the country. Locale normalization often falls back by cutting the country off, because we have common .pak files for countries with the same language. This patch: - Uses the locale resolvation only for concatenating .pak file paths and reports the full locale everywhere else. - Properly sets default ICU locale for JS number formats and prevents l10n_util::GetApplicationLocale() to set it sneakily to some resolved one. - Fixes the crashing --lang command line argument and always prefers its value over QLocale. Task-number: QTBUG-91225 Change-Id: I1c09798abdb523b80f0b7a3d69fa8d7a08c7c09a Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| | * | Report server directs in navigation typeAllan Sandfeld Jensen2021-04-191-1/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A server redirect might not have been reflected in the navigation type at this point, so also check the is_redirect value. Pick-to: 5.15.4 Fixes: QTBUG-92819 Change-Id: I711ef041de69552bc3485c9cf3db68c9e6033d6a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| | * Fix first party url for cookie filterTamas Zakor2021-04-154-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using SiteForCookies::RepresentativeUrl() if it is used to provide first party url because it returns a truncated URL and our API is expected to return the full url of the first party. Fixes: QTBUG-90231 Change-Id: I628f7f31bfbeaf3de976ae9af1a8fa6408b661c5 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| | * Update ChromiumMichael Brüning2021-04-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty d13920f2..048f5e99: > [Backport] CVE-2021-21220: Insufficient validation of untrusted input in V8 for x86_64 > [Backport] CVE-2021-21206: Use after free in Blink > Fix build with no extensions on mac Task-number: QTBUG-92080 Change-Id: I0265d3992ac3ec7fe0f55405daf58d1fc2789b12 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Update platform notesAllan Sandfeld Jensen2021-04-141-2/+2
| | | | | | | | | | | | | | | Change-Id: Iafdfb3c740ce42119a9891729be1ea0c89249039 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Remove NOTIMPLEMENTED from MediaStreamUIQt::OnDeviceStoppedPeter Varga2021-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | NOTIMPLEMENTED triggers an assert on Windows and OnDeviceStopped gets called. This function is also left empty for non-chromeos platforms in Chromium. Change-Id: I86c3fa0de6138ca374d4ec2c3d11270551fd3d71 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add BUILD.gn generation for the gn root and gn toolchainMichal Klocek2021-05-124-0/+826
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use simple templates. This will get own target in followup changes. Task-number: QTBUG-91760 Change-Id: I0b6991f7b54183aa9fb667cec5ad347f66c78b99 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Pass qtfeatures from the main project to the lib projectMichal Klocek2021-05-121-0/+5
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-91760 Change-Id: I56aaf6af42eb1877acbc0faf4e125bc8de4c72fb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Add configure.cmake filesMichal Klocek2021-05-121-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only evaluate features in the super repo and do not create config headers files during the configure step. However, print the build summary. The build config headers will be created during the configure step of 'libs' external project. Done-With: Jüri Valdmann <juri.valdmann@qt.io> Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Task-number: QTBUG-91760 Task-number: COIN-711 Change-Id: I481525571e71ca4684de5827f641416035a8f22a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Setup cmake projectMichal Klocek2021-05-123-0/+130
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the top level cmake project and ninja and gn cmake builds. Make ninja and gn build optional. With qmake we had four stages during the build: * configure (initial dependencies check) * qmake (build ninja, build gn, run gn) * make (compilation) * make install With cmake we have some limitations: a) we need to pass the build config to gn, however cmake evaluates generator expressions during the generation phase this means we need a recursive call to cmake b) qt-cmake qtbase logic (+syncqt) assumes "fixed" build locations to handle deployment of headers and libs (it uses CMAKE_BINARY_DIR for QT_BUILD_DIR) c) cmake can not run twice in the same build directory d) running recursive/child cmake, makes all generated targets not accessible during configure time of parent's cmake e) cmake can only "build" things for subdirectories To deal with mentioned limitations and to keep things simple we will split those steps into separate projects: * SUPERBUILD - this project does dependency checks, only evaluates features to show the build summary and passes them to EXAMPLES,LIBS,TESTS projects, it also runs the generator expression to feed LIBS project's cmake, it does not try to run syncqt as result of (b) and (c) * NINJA (build ninja) * GN (build gn) * LIBS - projects runs simplified feature evaluation (CONDITIONS resolved by SUPERBUILD cmake) to generate build headers (+syncqt), it also runs gn during configure and does all libs compilation. The project's source root must be "src" directory as a result of (a),(b),(c) * EXAMPLES - builds examples as a result of (d),(e) * TESTS - builds tests as a result of (d),(e) Each of projects will have three stages: configure, compile, install. Task-number: QTBUG-91760 Done-With: Jüri Valdmann <juri.valdmann@qt.io> Change-Id: I3b44decefa17f177e5e07c563796aa158a0b0ecb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Force to use c++17 for build with qmakePeter Varga2021-05-071-2/+2
| | | | | | | | | | Change-Id: Idfdfb1c88b9d2511c8a05b5ecd62c3421bf96bcf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix QWebEngineDownloadRequest signalsBalazs Egedi2021-05-071-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | downloadFileNameChanged and downloadDirectoryChanged signals were removed in 08375ee7 Rename QWebEngineDownloadItem -> QWebEngineDownloadRequest. Reintroduce these signals because they are still part of the API. Also test these in Widgets auto test. QQuickWebEngineDownloadItem::pathChanged were also removed in 75393077 Remove obsolete, deprecated api from qwebenginedownloaditem. Remove the pathChanged signal checks from the test because it was deprecated. The test tst_download.qml does not have quickcontrols1 dependency. Update it in the project file and re-enable the test. Change-Id: I702e04dfe2179beafc558a628bfa07f4090fede2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Make script execution order deterministicAllan Sandfeld Jensen2021-05-062-5/+6
| | | | | | | | | | | | | | Task-number: QTBUG-77765 Change-Id: I8680a46c62e6a915cbf10c3ae48573cb95f612a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix compile warningsBalazs Egedi2021-05-022-4/+3
| | | | | | | | | | | | | | Remove unused code and fix comparison between enum types. Change-Id: I78244462bea1e968a6bdff2db5b7ebad60bd25b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 01:07:10 +0000