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>

5 files changed, 11 insertions, 9 deletions

diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt
index 365aa30e40..7c2bfe5de7 100644
--- a/src/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/src/qmltyperegistrar/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name qmltyperegistrar)
 qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Types Registrar"
     SOURCES
-        ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
+        ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h
         qmltyperegistrar.cpp
         qmltypesclassdescription.cpp qmltypesclassdescription.h
         qmltypescreator.cpp qmltypescreator.h
@@ -16,7 +16,7 @@ qt_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
-        ../../tools/shared
+        ../qmlcompiler
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 27c7e0cadc..5f6568ac37 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Types Registrar"
     TOOLS_TARGET Qml # special case
     SOURCES
-        ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
+        ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h
         qmltyperegistrar.cpp
         qmltypesclassdescription.cpp qmltypesclassdescription.h
         qmltypescreator.cpp qmltypescreator.h
@@ -17,7 +17,7 @@ qt_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
     INCLUDE_DIRECTORIES
-        ../../tools/shared
+        ../qmlcompiler
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/src/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro
index 7ed3986dd7..eafaab6559 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.pro
+++ b/src/qmltyperegistrar/qmltyperegistrar.pro
@@ -5,16 +5,19 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 QMAKE_TARGET_DESCRIPTION = QML Types Registrar
 
-include(../../tools/shared/shared.pri)
+# We cannot link against libQmlCompiler as qmltyperegistrar
+# has to be built before libQmlCompiler.
+
+INCLUDEPATH += $$PWD/../qmlcompiler
 
 SOURCES += \
-    $$QMLSTREAMWRITER_SOURCES \
+    ../qmlcompiler/qmlstreamwriter.cpp \
     qmltyperegistrar.cpp \
     qmltypesclassdescription.cpp \
     qmltypescreator.cpp
 
 HEADERS += \
-    $$QMLSTREAMWRITER_HEADERS \
+    ../qmlcompiler/qmlstreamwriter_p.h \
     qmltypesclassdescription.h \
     qmltypescreator.h
 
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 0c2a70c6d1..7e5fca0c53 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include "qmltypescreator.h"
-#include "qmlstreamwriter.h"
 #include "qmltypesclassdescription.h"
 
 #include <QtCore/qset.h>
diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h
index 53976e775e..9fc62f9a9e 100644
--- a/src/qmltyperegistrar/qmltypescreator.h
+++ b/src/qmltyperegistrar/qmltypescreator.h
@@ -29,8 +29,8 @@
 #ifndef QMLTYPESCREATOR_H
 #define QMLTYPESCREATOR_H
 
-#include "qmlstreamwriter.h"
 #include "qmltypesclassdescription.h"
+#include "qmlstreamwriter_p.h"
 
 #include <QtCore/qstring.h>
 #include <QtCore/qset.h>