Move qmltyperegistrar into src

We want it to be available early in the build process.
qmltyperegistrar will be required to build qml, quick, and various
imports.

Change-Id: I15b827cd4b322a2bcea2780eeedb8dbe132aa59a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

10 files changed, 15 insertions, 7 deletions

diff --git a/tools/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp
index 8813907697..8813907697 100644
--- a/tools/qmltyperegistrar/qmltyperegistrar.cpp
+++ b/src/qmltyperegistrar/qmltyperegistrar.cpp
diff --git a/tools/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro
index 802526d964..8f4235c015 100644
--- a/tools/qmltyperegistrar/qmltyperegistrar.pro
+++ b/src/qmltyperegistrar/qmltyperegistrar.pro
@@ -5,16 +5,14 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 QMAKE_TARGET_DESCRIPTION = QML Types Registrar
 
-INCLUDEPATH += ../shared
+include(../../tools/shared/shared.pri)
 
 SOURCES += \
     qmltyperegistrar.cpp \
-    ../shared/qmlstreamwriter.cpp \
     qmltypesclassdescription.cpp \
     qmltypescreator.cpp
 
 HEADERS += \
-    ../shared/qmlstreamwriter.h \
     qmltypesclassdescription.h \
     qmltypescreator.h
 
diff --git a/tools/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf
index d8e826c671..d8e826c671 100644
--- a/tools/qmltyperegistrar/qmltypes.prf
+++ b/src/qmltyperegistrar/qmltypes.prf
diff --git a/tools/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp
index 8189bcd52e..8189bcd52e 100644
--- a/tools/qmltyperegistrar/qmltypesclassdescription.cpp
+++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp
diff --git a/tools/qmltyperegistrar/qmltypesclassdescription.h b/src/qmltyperegistrar/qmltypesclassdescription.h
index 8f3a6ea124..8f3a6ea124 100644
--- a/tools/qmltyperegistrar/qmltypesclassdescription.h
+++ b/src/qmltyperegistrar/qmltypesclassdescription.h
diff --git a/tools/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 7bac6a87d8..7bac6a87d8 100644
--- a/tools/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
diff --git a/tools/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h
index 9207a64b7e..9207a64b7e 100644
--- a/tools/qmltyperegistrar/qmltypescreator.h
+++ b/src/qmltyperegistrar/qmltypescreator.h
diff --git a/src/src.pro b/src/src.pro
index 98e1779dc5..2855102eff 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,7 +3,13 @@ CONFIG += ordered
 include($$OUT_PWD/qml/qtqml-config.pri)
 include($$OUT_PWD/quick/qtquick-config.pri)
 QT_FOR_CONFIG += qml qml-private quick-private
+
+# Otherwise we cannot compile qmltyperegistrar
+requires(qtConfig(commandlineparser))
+
+# We need qmltyperegistrar for all type registrations, even in qml
 SUBDIRS += \
+    qmltyperegistrar \
     qml \
     qmlmodels
 
diff --git a/tools/shared/shared.pri b/tools/shared/shared.pri
index c094b51d5f..1438c3b3da 100644
--- a/tools/shared/shared.pri
+++ b/tools/shared/shared.pri
@@ -1,3 +1,9 @@
 INCLUDEPATH += $$PWD
-SOURCES += $$PWD/resourcefilemapper.cpp
-HEADERS += $$PWD/resourcefilemapper.h
+
+SOURCES += \
+    $$PWD/resourcefilemapper.cpp \
+    $$PWD/qmlstreamwriter.cpp
+
+HEADERS += \
+    $$PWD/resourcefilemapper.h \
+    $$PWD/qmlstreamwriter.h
diff --git a/tools/tools.pro b/tools/tools.pro
index 69b79e8816..25ed760903 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -10,8 +10,6 @@ qtConfig(qml-devtools) {
     qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen
 }
 
-qtConfig(commandlineparser): SUBDIRS += qmltyperegistrar
-
 qtConfig(thread):!android|android_app:!wasm:!rtems {
     SUBDIRS += \
         qml