Commit Graph

13 Commits

Author SHA1 Message Date
Alexey Edelev 5efae5862f Add the use of the qt_internal_project_setup function
The function sets the required CMake variables and policies.

Pick-to: 6.5
Task-number: QTBUG-112685
Change-Id: Icf3d63847085b11e2453978f0dc51b968847c5bb
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-05-10 18:50:53 +02:00
Friedemann Kleint 93ece87be2 Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-02-08 16:20:50 +01:00
Lucie Gérard c47e029e79 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I3598499ab89b0e88718eded846306511000e8db9
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-25 10:17:22 +02:00
Lucie Gérard 238affae87 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: Ifbf0be4c6f03259f9d084bbef4cf44fa60bf3fde
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-07 18:18:28 +02:00
Alexandru Croitor f3a43f120b CMake: Bump almost all cmake_minimum_required calls to 3.16
Needed for subsequent change that will check and error out if the
version is lower than 3.16. We do that to ensure all policies
introduced by CMake up to version 3.16 have their behavior set to
NEW.

Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: Ide716d1d11dffd18d43c5eb67d41699ef986d138
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-09-22 19:36:56 +02:00
Joerg Bornemann 92fde1bc05 Remove unneeded CMake variable assignments
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: I9956b4352e034d4f1d43795e249d9e93875062ed
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-14 10:29:10 +02:00
Joerg Bornemann af068aada2 Use fixed qt_add_resource BASE argument
Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: I7457f9336915e5913c6c98053db979eb9ca197a5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-21 14:05:44 +02:00
Eirik Aavitsland cd270555d6 Ensure clean exit from configure in case of no-gui build
Fixes: QTBUG-88734
Change-Id: Ib2630658085d12de0151365fccf8e3ae9546c562
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 7ee2148f24)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-10 11:34:20 +00:00
Alexandru Croitor a159ce2ee6 CMake: Disable usage of CMake API compatibility wrappers
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: I4582f9f87571e1d25571c42ba20700b3dc79c07c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-01 12:10:15 +02:00
Alexandru Croitor 1a46fba0b9 CMake: Regenerate projects before API change
Task-number: QTBUG-86815
Change-Id: Ie06af33cee62d1742fabc4b992e6bc5a68fcc6a1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-23 02:17:03 +02:00
Alexandru Croitor 36c362412b Regenerate projects before merge
Change-Id: I9a889214e310b95ca1418925d6413602f9e00cea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-15 12:23:59 +00:00
Alexandru Croitor 981aa49d19 Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I99e95abde299432d6ea63eabd8d1f0b5b82a3039
2019-06-17 16:14:46 +02:00
Alexandru Croitor 9443239c2c Initial CMake Port
Port 90% of imageformats to be built with CMake.

Missing support for mng plugin and documentation.

Change-Id: I1d7e4b93c6f8446468f00dbf0663a6a4ec8c9774
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-28 12:50:42 +00:00