From 3ab4742c006a02d7650aeda0ad359c3231ab477d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Sat, 10 Jul 2021 21:15:50 +0200 Subject: CMake: Use QtBase_SOURCE_DIR instead of QT_SOURCE_TREE ...where applicable to use a known CMake-provided variable in favor of our own cooked up one. This affects four plugins that are not supposed to be built out of tree, meaning QtBase_SOURCE_DIR is available (and identical to QT_SOURCE_TREE). Task-number: QTBUG-88090 Change-Id: I27f012e6c5fd99c3239a1dd65c0811c819dbcfe9 Reviewed-by: Alexandru Croitor --- src/plugins/platforms/android/CMakeLists.txt | 2 +- src/plugins/platforms/direct2d/CMakeLists.txt | 2 +- src/plugins/platforms/windows/CMakeLists.txt | 2 +- src/printsupport/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index af9b7429b6..7f9150d4bf 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -45,7 +45,7 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin QT_USE_QSTRINGBUILDER INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} - ${QT_SOURCE_TREE}/src/3rdparty/android + ${QtBase_SOURCE_DIR}/src/3rdparty/android LIBRARIES EGL::EGL Qt::Core diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt index 04d317880f..a3ff060e2d 100644 --- a/src/plugins/platforms/direct2d/CMakeLists.txt +++ b/src/plugins/platforms/direct2d/CMakeLists.txt @@ -138,7 +138,7 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE SOURCES ../windows/qwindowstabletsupport.cpp ../windows/qwindowstabletsupport.h INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/3rdparty/wintab + ${QtBase_SOURCE_DIR}/src/3rdparty/wintab ) qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_sessionmanager diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 43f08a6a86..f03cf250ea 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -128,7 +128,7 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tablete SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/3rdparty/wintab + ${QtBase_SOURCE_DIR}/src/3rdparty/wintab ) qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 43dd89ed85..676631649d 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -181,7 +181,7 @@ qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX dialogs/qprintsettingsoutput.ui dialogs/qprintwidget.ui INCLUDE_DIRECTORIES - ${QT_SOURCE_TREE}/src/plugins/printsupport/cups + ${QtBase_SOURCE_DIR}/src/plugins/printsupport/cups ENABLE_AUTOGEN_TOOLS uic ) -- cgit v1.2.3