diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 15:33:16 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:54:07 +0000 |
| commit | f500062e165975e112ea644da1d6a3d4c413be2a (patch) | |
| tree | d7e92bcb689d53ab1046130250327974058ee7b4 /tools | |
| parent | f1f395b37da163bce2dc3b5fc4e298bb4f56a3e7 (diff) | |
Post Merge Fixes
Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/.prev_CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tools/qmlcachegen/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tools/qmlimportscanner/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/qmlimportscanner/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/qmlplugindump/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/qmlplugindump/CMakeLists.txt | 4 |
6 files changed, 22 insertions, 4 deletions
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index 51e66d54d2..d8248b40ba 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -6,13 +6,16 @@ qt_add_tool(qmlcachegen SOURCES + ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h + ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h generateloader.cpp qmlcachegen.cpp - resourcefilemapper.cpp resourcefilemapper.h resourcefilter.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII + INCLUDE_DIRECTORIES + ../shared LIBRARIES Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index a7fa98ebd8..aa9215fd49 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -7,13 +7,16 @@ 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 - resourcefilemapper.cpp resourcefilemapper.h resourcefilter.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/.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 diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index 90fd3d2ebb..c5a8d1b1c1 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -6,9 +6,11 @@ qt_add_tool(qmlplugindump SOURCES + ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h main.cpp - qmlstreamwriter.cpp qmlstreamwriter.h qmltypereader.cpp qmltypereader.h + INCLUDE_DIRECTORIES + ../shared LIBRARIES Qt::CorePrivate Qt::QmlPrivate diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 887fe0999e..6f1af762cd 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -7,9 +7,11 @@ qt_add_tool(qmlplugindump TOOLS_TARGET Qml # special case SOURCES + ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h main.cpp - qmlstreamwriter.cpp qmlstreamwriter.h qmltypereader.cpp qmltypereader.h + INCLUDE_DIRECTORIES + ../shared LIBRARIES Qt::CorePrivate Qt::QmlPrivate |