aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlcachegen
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-03-30 17:42:48 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-04-01 10:29:29 +0200
commitc38ea80c5dd71a20eade7b3a3b619c1996c6af0b (patch)
treebd7eafa6e0e19f0aca3911c74ab99c7b8062a14a /tools/qmlcachegen
parent4cf0962dc4d8d48aa600c5b56b160c8553782140 (diff)
Move qmllint's metatype support to tools/shared
We want to read qmltypes files and analyze scopes also from other tools. Furthermore, restructure the shared directory, so that each tool only includes what it needs. Change-Id: I96a2dcc8b1c5fac613592fb1867bf51fa5ef3a6e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmlcachegen')
-rw-r--r--tools/qmlcachegen/CMakeLists.txt1
-rw-r--r--tools/qmlcachegen/qmlcachegen.pro9
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 29302c1ef6..de842ea41b 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -7,7 +7,6 @@
qt_add_tool(qmlcachegen
TOOLS_TARGET Qml # special case
SOURCES
- ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
generateloader.cpp
qmlcachegen.cpp
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro
index ec65cdb5e6..d6e4812e3f 100644
--- a/tools/qmlcachegen/qmlcachegen.pro
+++ b/tools/qmlcachegen/qmlcachegen.pro
@@ -3,11 +3,16 @@ option(host_build)
QT = qmldevtools-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-SOURCES = qmlcachegen.cpp \
+include(../shared/shared.pri)
+
+SOURCES = \
+ $$RESOURCEFILEMAPPER_SOURCES \
+ qmlcachegen.cpp \
resourcefilter.cpp \
generateloader.cpp
-include(../shared/shared.pri)
+HEADERS = \
+ $$RESOURCEFILEMAPPER_HEADERS
TARGET = qmlcachegen