diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-10 21:18:53 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-12 18:56:14 +0200 |
| commit | 72a90810cb8e418c5317f484c5b2f9bb8cf264a0 (patch) | |
| tree | 2d0ff15eeb3a204e3f2e416f7e3d1503c6a5b376 /tests | |
| parent | 3ab4742c006a02d7650aeda0ad359c3231ab477d (diff) | |
CMake: Remove the usage of QT_SOURCE_TREE from tests
The ${QT_SOURCE_TREE}/src/network include paths of several tests are
apparently not needed anymore. Remove those.
tst_qfilesystementry and tst_qfreelist are the only tests that actually
need to reference files in qtbase's source tree. Simply use the paths
relative to the project file.
Task-number: QTBUG-88090
Change-Id: Ic6f341e001338c1b07dce6e58316245bc9560c5e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
6 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index 574ba0efc8..84758836f2 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -6,7 +6,8 @@ qt_internal_add_test(tst_qfilesystementry SOURCES - ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h + ../../../../../src/corelib/io/qfilesystementry.cpp + ../../../../../src/corelib/io/qfilesystementry_p.h tst_qfilesystementry.cpp PUBLIC_LIBRARIES Qt::CorePrivate diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt index d5b00ae69f..3790e46eaa 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt @@ -11,8 +11,6 @@ endif() qt_internal_add_test(tst_qsocketnotifier SOURCES tst_qsocketnotifier.cpp - INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/network PUBLIC_LIBRARIES Qt::CorePrivate Qt::Network diff --git a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt index cdac17e612..b1ac63ccff 100644 --- a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt @@ -16,5 +16,5 @@ qt_internal_add_test(tst_qfreelist qt_internal_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests SOURCES - ${QT_SOURCE_TREE}/src/corelib/tools/qfreelist.cpp + ../../../../../src/corelib/tools/qfreelist.cpp ) diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index 21bc3e2c80..cfd8a118ca 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -11,8 +11,6 @@ endif() qt_internal_add_test(tst_platformsocketengine SOURCES tst_platformsocketengine.cpp - INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/network PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 1d8e759f26..fcad653783 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -11,8 +11,6 @@ endif() qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp - INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/network PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 47c7698f94..64f3aa7a9e 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -11,8 +11,6 @@ endif() qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp - INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/network PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate |