aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltyperegistrar
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 /src/qmltyperegistrar
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 'src/qmltyperegistrar')
-rw-r--r--src/qmltyperegistrar/.prev_CMakeLists.txt1
-rw-r--r--src/qmltyperegistrar/CMakeLists.txt1
-rw-r--r--src/qmltyperegistrar/qmltyperegistrar.pro2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt
index 1d376d161f..c82a0e5a99 100644
--- a/src/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/src/qmltyperegistrar/.prev_CMakeLists.txt
@@ -7,7 +7,6 @@
qt_add_tool(qmltyperegistrar
SOURCES
../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
- ../../tools/shared/resourcefilemapper.cpp ../../tools/shared/resourcefilemapper.h
qmltyperegistrar.cpp
qmltypesclassdescription.cpp qmltypesclassdescription.h
qmltypescreator.cpp qmltypescreator.h
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index be3c28dc22..487c31d613 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -8,7 +8,6 @@ qt_add_tool(qmltyperegistrar
TOOLS_TARGET Qml # special case
SOURCES
../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
- ../../tools/shared/resourcefilemapper.cpp ../../tools/shared/resourcefilemapper.h
qmltyperegistrar.cpp
qmltypesclassdescription.cpp qmltypesclassdescription.h
qmltypescreator.cpp qmltypescreator.h
diff --git a/src/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro
index dff8f00ca3..7ed3986dd7 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.pro
+++ b/src/qmltyperegistrar/qmltyperegistrar.pro
@@ -8,11 +8,13 @@ QMAKE_TARGET_DESCRIPTION = QML Types Registrar
include(../../tools/shared/shared.pri)
SOURCES += \
+ $$QMLSTREAMWRITER_SOURCES \
qmltyperegistrar.cpp \
qmltypesclassdescription.cpp \
qmltypescreator.cpp
HEADERS += \
+ $$QMLSTREAMWRITER_HEADERS \
qmltypesclassdescription.h \
qmltypescreator.h