From e9c45bbdddd4df005bdaa5eea9740d351e6eaea2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 24 Oct 2018 15:20:27 +0200 Subject: Begin port of qtbase to CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Done-by: Alexandru Croitor Done-by: Frederik Gladhorn Done-by: Kevin Funk Done-by: Mikhail Svetkin Done-by: Simon Hausmann Done-by: Tobias Hunger Done-by: Tor Arne Vestbø Done-by: Volker Krause Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310 Reviewed-by: Simon Hausmann Reviewed-by: Tobias Hunger Reviewed-by: Mikhail Svetkin --- tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/auto/corelib/kernel/qmimedata/CMakeLists.txt (limited to 'tests/auto/corelib/kernel/qmimedata') diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt new file mode 100644 index 0000000000..78d0a69d68 --- /dev/null +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test(tst_qmimedata SOURCES tst_qmimedata.cpp) -- cgit v1.2.3 From b26b1455d75709a53f50e1d3d41c384f8e90b576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 3 Jul 2019 14:39:03 +0200 Subject: Implement SUBDIR-= conversion in pro2cmake tool CMake doesn't support removing subdirectories therefore one need to convert all removal to conditional adds. The resulting code doesn't win a beauty contest. That is because handle_subdir works on already processed strings which means it doesn't have access to the boolean operations. As such it can not minimize the expressions, but it works and in the most simple cases it is pretty good. The patch re-generates CMakeLists.txt under tests/auto/corelib/kernel excluding qcoreapplication, qmetatype, qmimedata, qobject, qtimer, which are suffering from unrelated problems, like for example Gui, pthread linkage issues. Change-Id: I18a02f6eda7a3b41b1313211c8bc9ce277bb67be Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tests/auto/corelib/kernel/qmimedata') diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index 78d0a69d68..dd1e049209 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test(tst_qmimedata SOURCES tst_qmimedata.cpp) +# Generated from qmimedata.pro. + +##################################################################### +## tst_qmimedata Test: +##################################################################### + +add_qt_test(tst_qmimedata + SOURCES + tst_qmimedata.cpp +) + +#### Keys ignored in scope 1:.:.:qmimedata.pro:: +# CONFIG = "testcase" -- cgit v1.2.3 From 9e96c384261ca1329d3143295d013701eb85b186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 4 Jul 2019 14:48:32 +0200 Subject: Properly convert default QT directive If unset QT by default has value: "core gui". This patch adds this behavior by pre-defining the value in the root scope. qmimedata CMakeList.txt was re-generated. Change-Id: Ib8b6064bc46c72d829e0077d09f21bbfb494e137 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi Reviewed-by: Tobias Hunger --- tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/corelib/kernel/qmimedata') diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index dd1e049209..7b373d6e6a 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_test(tst_qmimedata SOURCES tst_qmimedata.cpp + PUBLIC_LIBRARIES + Qt::Gui ) #### Keys ignored in scope 1:.:.:qmimedata.pro:: -- cgit v1.2.3 From d58d7ebfeacaab3d0840e97750c83e55f2fcf794 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 12:01:03 +0100 Subject: Regenerate tests/auto/corelib/kernel Change-Id: I466387408d26854e11fde0a1fbef74c2fad764c7 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/corelib/kernel/qmimedata') diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index 7b373d6e6a..b4965302dd 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -10,6 +10,3 @@ add_qt_test(tst_qmimedata PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 1:.:.:qmimedata.pro:: -# CONFIG = "testcase" -- cgit v1.2.3