From 767dd738d3de9306062707fe05d32c91ed755da3 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 1 Oct 2020 12:40:01 +0200
Subject: Long live libQtQmlCompiler!

Move all the code from tools/shared into src/qmlcompiler and build a
static library from it so that we can re-use it in external tools.

Change-Id: I7c8d8e59063dc7c711f4072f103a01095e6f5997
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 tools/qmlcachegen/.prev_CMakeLists.txt | 4 +---
 tools/qmlcachegen/CMakeLists.txt       | 4 +---
 tools/qmlcachegen/qmlcachegen.cpp      | 3 +--
 tools/qmlcachegen/qmlcachegen.pro      | 8 +-------
 4 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'tools/qmlcachegen')

diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index d21161d202..06b03d8e96 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -8,16 +8,14 @@ qt_get_tool_target_name(target_name qmlcachegen)
 qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Cache Generator"
     SOURCES
-        ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
         generateloader.cpp
         qmlcachegen.cpp
         resourcefilter.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
+        Qt::QmlCompilerPrivate
         Qt::QmlDevToolsPrivate
 )
 
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 8cbe8dcfac..a509166dee 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -9,16 +9,14 @@ qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Cache Generator"
     TOOLS_TARGET Qml # special case
     SOURCES
-        ../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
         generateloader.cpp
         qmlcachegen.cpp
         resourcefilter.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    INCLUDE_DIRECTORIES
-        ../shared
     PUBLIC_LIBRARIES
+        Qt::QmlCompilerPrivate
         Qt::QmlDevToolsPrivate
 )
 
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 174cd547f6..d8466a2a2d 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -40,8 +40,7 @@
 #include <private/qqmlirbuilder_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljslexer_p.h>
-
-#include "resourcefilemapper.h"
+#include <private/resourcefilemapper_p.h>
 
 #include <algorithm>
 
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro
index d02746cff7..530a0d54a1 100644
--- a/tools/qmlcachegen/qmlcachegen.pro
+++ b/tools/qmlcachegen/qmlcachegen.pro
@@ -1,19 +1,13 @@
 option(host_build)
 
-QT = qmldevtools-private
+QT = qmldevtools-private qmlcompiler-private
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
-include(../shared/shared.pri)
-
 SOURCES = \
-    $$RESOURCEFILEMAPPER_SOURCES \
     qmlcachegen.cpp \
     resourcefilter.cpp \
     generateloader.cpp
 
-HEADERS = \
-    $$RESOURCEFILEMAPPER_HEADERS
-
 TARGET = qmlcachegen
 
 build_integration.files = qmlcache.prf qtquickcompiler.prf
-- 
cgit v1.2.3