From 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 15:49:28 +0100 Subject: Post merge fixes Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272 Reviewed-by: Alexandru Croitor --- tools/CMakeLists.txt | 1 - tools/qml/.prev_CMakeLists.txt | 2 +- tools/qml/CMakeLists.txt | 2 +- tools/qmllint/.prev_CMakeLists.txt | 8 +++++--- tools/qmllint/CMakeLists.txt | 8 +++++--- tools/qmlmin/.prev_CMakeLists.txt | 18 ------------------ tools/qmlmin/CMakeLists.txt | 19 ------------------- 7 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 tools/qmlmin/.prev_CMakeLists.txt delete mode 100644 tools/qmlmin/CMakeLists.txt (limited to 'tools') diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index a0dc54ecd0..258a4a7569 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,7 +3,6 @@ if(QT_FEATURE_qml_devtools) add_subdirectory(qmllint) - add_subdirectory(qmlmin) add_subdirectory(qmlimportscanner) # special case: Do not build qmlcachegen here but build it at src/ # time, so that we can use it for our own .qml files in src/imports. diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 9c65660ece..31d9a65396 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -33,7 +33,7 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:: -# ICON = "resources/qml64.png" +# ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" ## Scopes: diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index 12cec77288..6727f51a92 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -44,7 +44,7 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:: -# ICON = "resources/qml64.png" +# ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" ## Scopes: diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 4dcfce16e8..9c44abe33b 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -7,13 +7,15 @@ qt_add_tool(qmllint SOURCES componentversion.cpp componentversion.h - fakemetaobject.cpp fakemetaobject.h findunqualified.cpp findunqualified.h + importedmembersvisitor.cpp importedmembersvisitor.h main.cpp - qcoloroutput.cpp qcoloroutput_p.h - qmljstypedescriptionreader.cpp qmljstypedescriptionreader.h + metatypes.h + qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h + typedescriptionreader.cpp typedescriptionreader.h LIBRARIES + Qt::CorePrivate Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::QmlDevTools diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index 80a5f11128..ef06ec4abb 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -8,13 +8,15 @@ qt_add_tool(qmllint TOOLS_TARGET Qml # special case SOURCES componentversion.cpp componentversion.h - fakemetaobject.cpp fakemetaobject.h findunqualified.cpp findunqualified.h + importedmembersvisitor.cpp importedmembersvisitor.h main.cpp - qcoloroutput.cpp qcoloroutput_p.h - qmljstypedescriptionreader.cpp qmljstypedescriptionreader.h + metatypes.h + qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h + typedescriptionreader.cpp typedescriptionreader.h LIBRARIES + Qt::CorePrivate Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::QmlDevTools diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt deleted file mode 100644 index 6e897137ba..0000000000 --- a/tools/qmlmin/.prev_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from qmlmin.pro. - -##################################################################### -## qmlmin Tool: -##################################################################### - -qt_add_tool(qmlmin - SOURCES - main.cpp - LIBRARIES - Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools -) - -#### Keys ignored in scope 1:.:.:qmlmin.pro:: -# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _OPTION = "host_build" diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt deleted file mode 100644 index 51ea6b52b6..0000000000 --- a/tools/qmlmin/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from qmlmin.pro. - -##################################################################### -## qmlmin Tool: -##################################################################### - -qt_add_tool(qmlmin - TOOLS_TARGET Qml # special case - SOURCES - main.cpp - LIBRARIES - Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools -) - -#### Keys ignored in scope 1:.:.:qmlmin.pro:: -# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _OPTION = "host_build" -- cgit v1.2.3