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/qmlplugindump/.prev_CMakeLists.txt | 4 ++--
 tools/qmlplugindump/CMakeLists.txt       | 4 ++--
 tools/qmlplugindump/main.cpp             | 2 +-
 tools/qmlplugindump/qmlplugindump.pro    | 9 ++++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'tools/qmlplugindump')

diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index 79a4b0b18d..bf65d71c49 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -8,11 +8,11 @@ qt_get_tool_target_name(target_name qmlplugindump)
 qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
     SOURCES
-        ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
+        ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h
         main.cpp
         qmltypereader.cpp qmltypereader.h
     INCLUDE_DIRECTORIES
-        ../shared
+        ../../src/qmlcompiler
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index cbeb03f38b..d8fdaeee8c 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -9,11 +9,11 @@ qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
     TOOLS_TARGET Qml # special case
     SOURCES
-        ../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
+        ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h
         main.cpp
         qmltypereader.cpp qmltypereader.h
     INCLUDE_DIRECTORIES
-        ../shared
+        ../../src/qmlcompiler
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index ab26c5b3d5..bfc78f2974 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -60,7 +60,7 @@
 #include <algorithm>
 
 #include "qmltypereader.h"
-#include "qmlstreamwriter.h"
+#include "qmlstreamwriter_p.h"
 
 #ifdef QT_SIMULATOR
 #include <QtGui/private/qsimulatorconnection_p.h>
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 8bf40d2c8d..217fe23bbe 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -5,15 +5,18 @@ CONFIG += no_import_scan
 
 QTPLUGIN.platforms = qminimal
 
-include(../shared/shared.pri)
+# We cannot use libQmlCompiler as that is built for the host
+# and qmlplugindump needs to be built for the target.
+
+INCLUDEPATH += $$PWD/../../src/qmlcompiler
 
 SOURCES += \
-    $$QMLSTREAMWRITER_SOURCES \
+    ../../src/qmlcompiler/qmlstreamwriter.cpp \
     main.cpp \
     qmltypereader.cpp
 
 HEADERS += \
-    $$QMLSTREAMWRITER_HEADERS \
+    ../../src/qmlcompiler/qmlstreamwriter_p.h \
     qmltypereader.h
 
 macx {
-- 
cgit v1.2.3