summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Rename QmlDevTools to QmlDevToolsPrivateAlexey Edelev2021-06-151-1/+1
| | | | | Change-Id: Icec4885ef5e56019c4fac205aa15a224d91ef0b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-251-0/+3
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ibea15ff714958ad3e70a8b86ae8c6c18c94ccf16 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix missing qdbus.exe and qdbusviewer.exe on WindowsLi Xinwei2020-11-221-3/+1
| | | | | | | | | Qt DBus module is also available on Windows. Excluding it from optional components of Win32 will prevent building qdbus.exe and qdbusviewer.exe. Pick-to: 6.0.0 6.0 Change-Id: Id2cb4965beb8f136c62c42a80bc9b922d0ffca3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Add deferred dependencies to doc toolsJoerg Bornemann2020-10-271-0/+6
| | | | | | | | | | | | qt_internal_add_docs defers dependencies to qdoc, qtattributionsscanner and qhelpgenerator. Call qt_internal_add_deferred_dependencies after those targets have been created. This makes it possible to build the doc tools automatically when building generate_docs_Foo targets without installing first. Change-Id: I4fa5082830303cfb22ed2b590e0e9036c3678cd4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Make optional packages not being found a bit quieterAlexandru Croitor2020-10-211-2/+3
| | | | | | Task-number: QTBUG-86053 Change-Id: I9afbea16b8b71f78a77ff77efd57397b438eba60 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix warnings from missing optional modulesVolker Hilsheimer2020-10-201-1/+10
| | | | | | | | Don't try to add AxContainer and DBus on platforms where those are not relevant. Change-Id: Ibfa9845df59fbe2e5036207018bc1893f07e88d9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Disable usage of CMake API compatibility wrappersAlexandru Croitor2020-10-011-0/+4
| | | | | | | | | 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: I35f75f7a384abb5265e8d02ec22f8218ef11e234 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate qttoolsAlexandru Croitor2020-06-291-1/+2
| | | | | Change-Id: I215dd95fe4467b2b2a7c24b1b5be523ef2e83980 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix build of the ActiveQt designer pluginJoerg Bornemann2020-05-141-1/+1
| | | | | | | We need to add AxContainer to the top-level find_package call. Change-Id: I5ba26c6c75d54387a9cb7617a65fecd86b2f836d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* cmake: Add Qt6Dbus to the optional dependencies listChristophe Giboudeaux2020-05-071-1/+1
| | | | | | | | The build system checks whether the 'Qt::DBus' target is available before building src/qdbus. Change-Id: I29bd8305cfc32d1a07847aecb94054ed8f8988c7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix qttools build if qtdeclarative is not availableAlexandru Croitor2020-03-201-1/+1
| | | | | | | | | | | OpenGL and OpenGLWidgets were implicitly found via qtdeclarative modules, but the configuration fails in case if those are not present. So they should be explicitly searched for. Change-Id: Ia54451f66ca291fac84eb1ba8937d532a5675b8a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Port the rest of QtToolsLeander Beernaert2019-12-121-1/+1
| | | | | | Change-Id: I4115bde9af38219682d0e6707bc7aa8fcb8d6bb0 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix buildSimon Hausmann2019-11-221-1/+1
| | | | | | | | Designer needs Qt::Network and since it's not conditional in src, let's make it a required package. Change-Id: I23ebe8a298999b87b5e4ca0d2a03d97568182d55 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Mark qttools as not being warnings cleanAlexandru Croitor2019-11-121-2/+5
| | | | | | | | | | So that compilation doesn't fail when the WARNINGS_ARE_ERRORS option is enabled. This mimics what .qmake.conf warning_clean does. Change-Id: I511697c226465e67b14762fd2c52c90e0270a8fc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate before mergeAlexandru Croitor2019-10-151-4/+8
| | | | | Change-Id: I857f2c966240b5e056e30531b4bc3e2fc9c68e8e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Initial port to CMakeAlexandru Croitor2019-08-281-0/+12
Includes the main bits and also projects under src/linguist. Task-number: QTBUG-76002 Change-Id: I5fa9144c834f245ab85fc831c8e58afd8d02800e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 10:57:45 +0000