aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlimportscanner
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-11-25 15:33:16 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2019-11-25 14:54:07 +0000
commitf500062e165975e112ea644da1d6a3d4c413be2a (patch)
treed7e92bcb689d53ab1046130250327974058ee7b4 /tools/qmlimportscanner
parentf1f395b37da163bce2dc3b5fc4e298bb4f56a3e7 (diff)
Post Merge Fixes
Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools/qmlimportscanner')
-rw-r--r--tools/qmlimportscanner/.prev_CMakeLists.txt4
-rw-r--r--tools/qmlimportscanner/CMakeLists.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index 7f736f24df..e69eb179d8 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -6,10 +6,14 @@
qt_add_tool(qmlimportscanner
SOURCES
+ ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
+ ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
main.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
+ INCLUDE_DIRECTORIES
+ ../shared
LIBRARIES
Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index bffbb5f47b..4bbc8d0eee 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -7,10 +7,14 @@
qt_add_tool(qmlimportscanner
TOOLS_TARGET Qml # special case
SOURCES
+ ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
+ ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
main.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
+ INCLUDE_DIRECTORIES
+ ../shared
LIBRARIES
Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES