diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-30 17:42:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-01 10:29:29 +0200 |
| commit | c38ea80c5dd71a20eade7b3a3b619c1996c6af0b (patch) | |
| tree | bd7eafa6e0e19f0aca3911c74ab99c7b8062a14a /tools/qmlimportscanner | |
| parent | 4cf0962dc4d8d48aa600c5b56b160c8553782140 (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/qmlimportscanner')
| -rw-r--r-- | tools/qmlimportscanner/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmlimportscanner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmlimportscanner/qmlimportscanner.pro | 8 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index fbab757807..c3c05e2e0f 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_tool(qmlimportscanner SOURCES - ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h main.cpp DEFINES diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 30a4babfcd..8047d43aa7 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -7,7 +7,6 @@ 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 diff --git a/tools/qmlimportscanner/qmlimportscanner.pro b/tools/qmlimportscanner/qmlimportscanner.pro index 33089a5c48..9fd2a38956 100644 --- a/tools/qmlimportscanner/qmlimportscanner.pro +++ b/tools/qmlimportscanner/qmlimportscanner.pro @@ -3,9 +3,15 @@ option(host_build) QT = core qmldevtools-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -SOURCES += main.cpp include(../shared/shared.pri) +SOURCES += \ + $$RESOURCEFILEMAPPER_SOURCES \ + main.cpp + +HEADERS += \ + $$RESOURCEFILEMAPPER_HEADERS + load(cmake_functions) CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) |