Move plugins and imports into place during compile.

QtQuick3D puts everything into place that it needs to run during the
compile step.  You should be able to build and then run, without having
to do make install.

Don't know how this got missed previously.

7 files changed, 25 insertions, 0 deletions

diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index c0c9158fe..833b66e84 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -7,6 +7,7 @@ package {
     INCLUDEPATH += ../../../include
 } else {
     CONFIG += qt3dquick
+    DESTDIR = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
 }
 
 win32 {
@@ -50,6 +51,15 @@ qdeclarativesources.files += \
     teapot.bez
 # see the file README.library_xml for more on library.xml
 
+!package {
+    qdeclarative_in_place.input = qdeclarativesources.files
+    qdeclarative_in_place.output = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    qdeclarative_in_place.CONFIG += no_link_no_clean
+    qdeclarative_in_place.variable_out = PRE_TARGETDEPS
+    QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
+}
+
 qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
 
 target.path += $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 755bb453d..c759bedab 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -7,6 +7,7 @@ package {
     INCLUDEPATH += ../../../include
 } else {
     CONFIG += qt3d qt3dquick
+    DESTDIR = $$[QT_INSTALL_IMPORTS]/Qt3D
 }
 
 win32 {
@@ -48,6 +49,15 @@ qdeclarativesources.files += \
     qmldir \
     library.xml
 
+!package {
+    qdeclarative_in_place.input = qdeclarativesources.files
+    qdeclarative_in_place.output = $$[QT_INSTALL_IMPORTS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    qdeclarative_in_place.CONFIG += no_link_no_clean
+    qdeclarative_in_place.variable_out = PRE_TARGETDEPS
+    QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
+}
+
 qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D
 
 target.path += $$[QT_INSTALL_IMPORTS]/Qt3D
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index ce0437383..57ab0e44d 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -1,5 +1,6 @@
 TARGET = qtga
 include(../../qpluginbase.pri)
+!package: DESTDIR = $$[QT_INSTALL_PLUGINS]/imageformats
 HEADERS += qtgahandler.h \
     qtgafile.h
 SOURCES += main.cpp \
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro
index a0fdcfefa..9ac5c8bca 100644
--- a/src/plugins/sceneformats/3ds/3ds.pro
+++ b/src/plugins/sceneformats/3ds/3ds.pro
@@ -15,6 +15,7 @@ package {
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
+    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
 system_3ds {
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index 7bb9f3bbf..e47a51287 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -19,6 +19,7 @@ package {
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
+    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
 system_ai {
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index 6341a1cdb..d9197ed79 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -12,6 +12,7 @@ package {
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
+    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
 target.path += $$[QT_INSTALL_PLUGINS]/sceneformats
diff --git a/src/plugins/sceneformats/obj/obj.pro b/src/plugins/sceneformats/obj/obj.pro
index 731118877..03e33e8dd 100644
--- a/src/plugins/sceneformats/obj/obj.pro
+++ b/src/plugins/sceneformats/obj/obj.pro
@@ -12,6 +12,7 @@ package {
     INCLUDEPATH += ../../../../include
 } else {
     CONFIG += qt3d
+    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
 target.path += $$[QT_INSTALL_PLUGINS]/sceneformats