whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2021-07-10 21:15:50 +02:00
parent 41977d456b
commit 3ab4742c00
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/android/CMakeLists.txt
View File

@ -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

2
src/plugins/platforms/direct2d/CMakeLists.txt
View File

@ -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

2
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -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

2
src/printsupport/CMakeLists.txt
View File

@ -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
)