From 14492ecee2e34843efd3ef070503a43a48552055 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 9 Mar 2020 13:53:53 +0100
Subject: CMake: Regenerate and adapt to merge from dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
---
 tools/qmlimportscanner/.prev_CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tools/qmlimportscanner/.prev_CMakeLists.txt')

diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index e69eb179d8..fbab757807 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -14,16 +14,14 @@ qt_add_tool(qmlimportscanner
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::QmlDevToolsPrivate
     PUBLIC_LIBRARIES
-        Qt::QmlDevTools
+        Qt::QmlDevToolsPrivate
 )
 
 #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>:
 # CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
 # CMAKE_DEBUG_TYPE = <EMPTY>
-# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])"
+# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX])"
 # CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY>
 # CMAKE_RELEASE_TYPE = <EMPTY>
 # QMAKE_SUBSTITUTES = "cmake_config_file"
@@ -42,7 +40,7 @@ qt_add_tool(qmlimportscanner
 # CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
 
 #### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_:
-# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/"
+# CMAKE_QML_DIR = "$$[QT_INSTALL_QML]/"
 # CMAKE_QML_DIR_IS_ABSOLUTE = "True"
 
 #### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib:
-- 
cgit v1.2.3