consistently put {qt,qml}_{module,plugin} at the end of project files

this fixes static builds by ensuring that all dependencies are exported.

Task-number: QTBUG-51071
Change-Id: Ied46fc47e5f998053ab8a31547e09676144a65c1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

12 files changed, 29 insertions, 30 deletions

diff --git a/src/core/core.pro b/src/core/core.pro
index ca852e2a1..a02f3df47 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -2,8 +2,6 @@ TARGET     = Qt3DCore
 MODULE     = 3dcore
 QT         = core-private gui-private
 
-load(qt_module)
-
 DEFINES += QT3DCORE_LIBRARY
 
 gcov {
@@ -18,3 +16,5 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 include(core.pri)
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
+
+load(qt_module)
diff --git a/src/input/input.pro b/src/input/input.pro
index 92dc81104..dbb77d87b 100644
--- a/src/input/input.pro
+++ b/src/input/input.pro
@@ -6,11 +6,11 @@ DEFINES += QT3DINPUT_LIBRARY
 
 MODULE = 3dinput
 
-load(qt_module)
-
 include(frontend/frontend.pri)
 include(backend/backend.pri)
 
 HEADERS += \
     qt3dinput_global.h \
     qt3dinput_global_p.h
+
+load(qt_module)
diff --git a/src/logic/logic.pro b/src/logic/logic.pro
index 9ed6349f8..dd0d8bb36 100644
--- a/src/logic/logic.pro
+++ b/src/logic/logic.pro
@@ -2,8 +2,6 @@ TARGET     = Qt3DLogic
 MODULE     = 3dlogic
 QT         = core-private gui-private 3dcore 3dcore-private
 
-load(qt_module)
-
 DEFINES += QT3DLOGIC_LIBRARY
 
 gcov {
@@ -16,3 +14,5 @@ gcov {
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(logic.pri)
+
+load(qt_module)
diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro
index 3660b1f6d..71fffe2e7 100644
--- a/src/plugins/sceneparsers/assimp/assimp.pro
+++ b/src/plugins/sceneparsers/assimp/assimp.pro
@@ -1,9 +1,6 @@
 TARGET = assimpsceneparser
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
-PLUGIN_TYPE = sceneparsers
-PLUGIN_CLASS_NAME = AssimpParserPlugin
-load(qt_plugin)
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
 include(../../../3rdparty/assimp/assimp_dependency.pri)
 
@@ -18,3 +15,7 @@ SOURCES += \
 
 DISTFILES += \
     assimp.json
+
+PLUGIN_TYPE = sceneparsers
+PLUGIN_CLASS_NAME = AssimpParserPlugin
+load(qt_plugin)
diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro
index be219fa9f..675d127da 100644
--- a/src/plugins/sceneparsers/gltf/gltf.pro
+++ b/src/plugins/sceneparsers/gltf/gltf.pro
@@ -1,9 +1,6 @@
 TARGET = gltfsceneparser
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
-PLUGIN_TYPE = sceneparsers
-PLUGIN_CLASS_NAME = GLTFSceneParserPlugin
-load(qt_plugin)
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
 HEADERS += \
     gltfparser.h
@@ -14,3 +11,7 @@ SOURCES += \
 
 DISTFILES += \
     gltf.json
+
+PLUGIN_TYPE = sceneparsers
+PLUGIN_CLASS_NAME = GLTFSceneParserPlugin
+load(qt_plugin)
diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro
index 1c229b6d2..7f99b17c1 100644
--- a/src/quick3d/imports/input/importsinput.pro
+++ b/src/quick3d/imports/input/importsinput.pro
@@ -6,10 +6,10 @@ QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private
 
 OTHER_FILES += qmldir
 
-load(qml_plugin)
-
 HEADERS += \
     qt3dquick3dinputplugin.h
 
 SOURCES += \
     qt3dquick3dinputplugin.cpp
+
+load(qml_plugin)
diff --git a/src/quick3d/imports/logic/importslogic.pro b/src/quick3d/imports/logic/importslogic.pro
index e68a75b91..90f9f2445 100644
--- a/src/quick3d/imports/logic/importslogic.pro
+++ b/src/quick3d/imports/logic/importslogic.pro
@@ -6,10 +6,10 @@ QT += core-private qml 3dcore 3dlogic
 
 OTHER_FILES += qmldir
 
-load(qml_plugin)
-
 HEADERS += \
     qt3dquick3dlogicplugin.h
 
 SOURCES += \
     qt3dquick3dlogicplugin.cpp
+
+load(qml_plugin)
diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro
index fa6116285..caf6a37bb 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -12,8 +12,6 @@ SOURCES += \
 
 OTHER_FILES += qmldir
 
-load(qml_plugin)
-
 include(./defaults/defaults.pri)
 
 OTHER_FILES += \
@@ -40,3 +38,5 @@ RESOURCE_CONTENT += \
 write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.")
 
 RESOURCES += $$GENERATED_RESOURCE_FILE
+
+load(qml_plugin)
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index a1d26a0ca..0a1c2e94b 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -6,8 +6,6 @@ DEFINES += QT3DQUICK_LIBRARY
 
 MODULE   = 3dquick
 
-load(qt_module)
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -37,3 +35,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)
diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
index f32dde78f..276198d9c 100644
--- a/src/quick3d/quick3dinput/quick3dinput.pro
+++ b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -7,8 +7,6 @@ DEFINES += QT3DQUICKINPUT_LIBRARY
 
 MODULE   = 3dquickinput
 
-load(qt_module)
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -32,3 +30,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index 3a723f1e3..85d839ad5 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -7,8 +7,6 @@ DEFINES += QT3DQUICKRENDER_LIBRARY
 
 MODULE   = 3dquickrender
 
-load(qt_module)
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -31,3 +29,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)
diff --git a/src/render/render.pro b/src/render/render.pro
index b7a74e48e..097016e45 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -6,10 +6,6 @@ DEFINES += QT3DRENDER_LIBRARY
 
 MODULE   = 3drender
 
-MODULE_PLUGIN_TYPES = \
-    sceneparsers
-
-load(qt_module)
 
 include (backend/render-backend.pri)
 include (geometry/geometry.pri)
@@ -52,3 +48,7 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 SOURCES += \
     renderlogging.cpp
+
+MODULE_PLUGIN_TYPES = \
+    sceneparsers
+load(qt_module)