summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Don't use internal compatibility APIFabian Kosmale2021-06-051-0/+3
| | | | | Change-Id: Ia55eab18aae5c0f2f42f317e545668db87ba84aa Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove AndroidExtras dependencies and port to new Qt 6 Android APIsVille Voutilainen2021-06-041-7/+1
| | | | | | | | | Task-number: QTBUG-93811 Change-Id: Ia3eb9ad90f27614db5997e1f41f13e050f5f4ab7 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-211-0/+3
| | | | | | | Task-number: QTBUG-86726 Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change version number in CMakeLists.txtAndreas Buhr2021-03-261-1/+1
| | | | | | | | | This patch changes the version number in CMakeLists.txt to use the variable QT_REPO_MODULE_VERSION like in all other modules. Change-Id: Ia2a5638b5eac7244cae410255cc715094f68094b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* remove QtConcurrent dependencyAndreas Buhr2021-03-041-2/+1
| | | | | | | | | QtBluetooth used QtConcurrent internally in the past. This is no longer the case. The dependency can be removed. Fixes: QTBUG-89494 Change-Id: I7e0657f79bc02ec794311d25d245a7ae5cef02e7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove all *.pro files and all "special case" markers in CMakeLists.txtAndreas Buhr2021-01-151-6/+2
| | | | | | | | | | | | To use CMake only in the future to build QtConnectivity, all the traces from the qmake->CMake conversion can now be removed. This patch deletes all ".prev_CMakeLists.txt" files, in deletes all "*.pro" files and it removes all "special case" markers in CMakeLists.txt files. "special case" in "*.cmake" files are kept. Change-Id: Ia0f5d4de5d77b9f2e5cc8d97fc8f04077e042a6f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update CMake scripts in QtConnectivityAndreas Buhr2020-12-211-3/+3
| | | | | | | | | Recreated all CMake files in QtConnectivity using run_pro2cmake.py . --only-existing -- --api-version 3 Furthermore, port bttestui to CMake. Change-Id: Idb55f1b4c1cff30d7824a42e3ee6923c39e698df Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: fix build with bluezSamuli Piippo2020-08-141-0/+1
| | | | | | | Use correct condition variable and make sure dbus can be used. Change-Id: Ie2c139e48c5ffa76c98ca60b3315db1de55cf711 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update top level cmakelists with pro2cmake and add resulting cmake.confOliver Wolff2020-07-291-0/+1
| | | | | Change-Id: Id09067de392240e9c4d3b2ab50edfb853c36574f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update CMakeLists.txt filesOliver Wolff2020-07-031-0/+3
| | | | | | | | Result of reruns of pro2cmake, some manual fixes after the merge and one addition of the missing AndroidExtras dependency for Android. Change-Id: I5a124c51d0cb9be5767ee7185744aa0694cc2c7b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Mark qtconnectivity as not being warnings cleanAlexandru Croitor2019-11-121-0/+1
| | | | | | | | | | So that compilation doesn't fail when the WARNINGS_ARE_ERRORS option is enabled. This mimics what .qmake.conf warning_clean does. Change-Id: I05b04a35587aa254c758fb9256459817ae9dd832 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Port qtconnectivity to cmakeOliver Wolff2019-10-241-0/+25
Also removed dependencies.yaml at the same time, as the new dependency tracking is not used in wip/cmake at the moment. Task-number: QTBUG-78181 Change-Id: I39c23da8daeedd86b7720d66d48ab0af3762083c Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>