aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Remove qtquickcontrols2 sources and explain where they wentHEADdevMitch Curtis2021-08-161-19/+0
| | | | | | | | | | | | Now that qtquickcontrols2 has been merged into qtdeclarative, we should make it obvious that this repo should no longer be used, by preventing it from being built. Task-number: QTBUG-95173 Pick-to: 6.2 Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-141-8/+0
| | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: I6085882a944f423da719ac13c8a12a4962c63bf6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-221-0/+3
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ie638443a76623df0ec20fbcd5485af59866deee6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Make Gui and some other packages optionalAlexandru Croitor2020-11-101-2/+2
| | | | | | | | | | This allows a no-error configuration of a -no-gui Qt build. This results in skipping building qtquickcontrols2 when Gui / Quick are not available. qmake does the same. Task-number: QTBUG-88343 Change-Id: I074f62e4491278ec93f1c6225923111b5eadf2ec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix no-widgets buildAlexandru Croitor2020-10-211-3/+2
| | | | | | Task-number: QTBUG-86053 Change-Id: Ia2e3c3d0164550bb77b73edb3ef8f5e634e09ea7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Disable usage of CMake API compatibility wrappersAlexandru Croitor2020-10-071-0/+5
| | | | | | | | | Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable in the project ensures we ported away from old API calls. Task-number: QTBUG-86815 Change-Id: I3ca1422448dbcadfdb3ed668ba4cfcddcb2d5b7e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't find_package(Qt6QmlTools) directly for cross-buildsAlexandru Croitor2020-08-121-1/+1
| | | | | | | | | | | | | It will fail when cross compiling to a platform that has a different size value of CMAKE_SIZEOF_VOID_P than the host one. Instead call find_package() on the base package (Qml in this case) and it will look for QmlTools itself in a special way that that resets the value of CMAKE_SIZEOF_VOID_P, thus ensuring the package is found. Fixes: QTBUG-86012 Change-Id: Ibf7f06b8cfea0ccde10b7ca8429ef8ae598f93f2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Remove Qt Labs CalendarMitch Curtis2020-05-281-1/+2
| | | | | | | | | | This is getting its own repository as part of the move to the marketplace. Task-number: QTBUG-84172 Pick-to: 5.15 Change-Id: I2f963c298d6ef95e0832f95aa1e1ea809f4867a2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Regenerate projects to be in syncAlexandru Croitor2019-11-151-2/+8
| | | | | | Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update QtQuickControls2 project filesLeander Beernaert2019-10-081-1/+3
| | | | | | | | Re-run pro2cmake on all the project files. Change-Id: I8d349cf34d6cc8e26c76193d9ef220fa85b16bb8 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Initial CMake conversion for QtQuickControls2Leander Beernaert2019-08-061-0/+11
The CMake setup only covers everything under the src directory. Tests and examples will follow in separate patches. Change-Id: Ic4dbf6efa3128d0eea3af99117ba87690cb51077 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>