diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 15:23:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 10:05:15 +0000 |
| commit | 4936b6c7950d493436c035ee3130ff0b2b675e49 (patch) | |
| tree | 3384b462889b4d3c2b95388ea9d8d19c903056cf | |
| parent | 43d792700423b34eedf785321be09faa6de134eb (diff) | |
Regenerate tests/auto/gui/kernel
Change-Id: I32046f33612f9b306dd889a0d42aa70d32375531
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
6 files changed, 48 insertions, 10 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt index cefb0b7c16..1874a33794 100644 --- a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt @@ -9,15 +9,15 @@ endif() ##################################################################### add_qt_test(tst_qguiapplication - GUI SOURCES - ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h + tst_qcoreapplication.cpp tst_qcoreapplication.h tst_qguiapplication.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0x050E00 INCLUDE_DIRECTORIES ../../../corelib/kernel/qcoreapplication LIBRARIES + Qt::CorePrivate Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt index caa09c9e1c..09498e2a39 100644 --- a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt @@ -9,7 +9,6 @@ endif() ##################################################################### add_qt_test(tst_qguiapplication - GUI SOURCES ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case tst_qguiapplication.cpp @@ -18,6 +17,7 @@ add_qt_test(tst_qguiapplication INCLUDE_DIRECTORIES ../../../corelib/kernel/qcoreapplication LIBRARIES + Qt::CorePrivate Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui diff --git a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c4daa5a310 --- /dev/null +++ b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt @@ -0,0 +1,28 @@ +# Generated from qguieventloop.pro. + +##################################################################### +## tst_qguieventloop Test: +##################################################################### + +add_qt_test(tst_qguieventloop + SOURCES + ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network +) + +## Scopes: +##################################################################### + +extend_target(tst_qguieventloop CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + user32 +) + +extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib + DEFINES + HAVE_GLIB +) diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt index 7ac5cdc343..c4daa5a310 100644 --- a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt +++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt @@ -5,14 +5,13 @@ ##################################################################### add_qt_test(tst_qguieventloop - GUI SOURCES ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp - LIBRARIES # special case - Qt::CorePrivate # special case + LIBRARIES + Qt::CorePrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Network # special case + Qt::Network ) ## Scopes: diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt new file mode 100644 index 0000000000..6d0f3cbbee --- /dev/null +++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qguitimer.pro. + +##################################################################### +## tst_qguitimer Test: +##################################################################### + +add_qt_test(tst_qguitimer + SOURCES + ../../../corelib/kernel/qtimer/tst_qtimer.cpp + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt index 1fbd53091f..1915f28a18 100644 --- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt @@ -13,6 +13,3 @@ add_qt_test(tst_qopenglwindow PUBLIC_LIBRARIES Qt::Gui ) - -## Scopes: -##################################################################### |