feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpreview: adapt to new location of debug translation protocol

Browse Source 
Change-Id: I6bcb6e9f18724f22b10586a6550fada991ca8678
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2021-04-30 09:25:14 +02:00
parent 24739515e5
commit 8eb5a08c1b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlpreview/CMakeLists.txt
View File

@@ -1,5 +1,3 @@
find_package(Qt5 COMPONENTS QmlDebug REQUIRED)
add_qtc_plugin(QmlPreview add_qtc_plugin(QmlPreview
PUBLIC_DEPENDS QmlDebug PUBLIC_DEPENDS QmlDebug
DEPENDS QmlJS DEPENDS QmlJS
@@ -28,7 +26,7 @@ extend_qtc_plugin(QmlPreview
# who needs it in older but special built Qt versions aswell # who needs it in older but special built Qt versions aswell
string(REGEX MATCH "^[0-9]*" QT_VERSION_MAJOR ${Qt5_VERSION}) string(REGEX MATCH "^[0-9]*" QT_VERSION_MAJOR ${Qt5_VERSION})
get_target_property(qmldebugprivate_include_directories get_target_property(qmldebugprivate_include_directories
Qt${QT_VERSION_MAJOR}::QmlDebugPrivate Qt${QT_VERSION_MAJOR}::QmlPrivate
INTERFACE_INCLUDE_DIRECTORIES INTERFACE_INCLUDE_DIRECTORIES
) )
find_file(have_qml_debug_translation_protocol find_file(have_qml_debug_translation_protocol
@@ -37,6 +35,6 @@ find_file(have_qml_debug_translation_protocol
) )
extend_qtc_plugin(QmlPreview extend_qtc_plugin(QmlPreview
CONDITION have_qml_debug_translation_protocol CONDITION have_qml_debug_translation_protocol
DEPENDS Qt5::QmlDebugPrivate PUBLIC_DEPENDS Qt5::QmlPrivate
PUBLIC_DEFINES "FOUND_QML_DEBUG_TRANSLATION_PROTOCOL" PUBLIC_DEFINES "FOUND_QML_DEBUG_TRANSLATION_PROTOCOL"
) )