Merge branch '5.6' into 5.7

Conflicts:
	examples/qt3d/examples-common/qorbitcontrol.h
	src/core/qnodecreatedchange.cpp
	src/core/qnodecreatedchange.h
	src/input/frontend/qaxisactionhandler.h
	src/input/frontend/qinputaspect.h
	src/input/frontend/qkeyboardhandler.h
	src/input/frontend/qmousedevice.h
	src/input/frontend/qmousehandler.h
	src/input/frontend/qphysicaldevicecreatedchange.h
	src/input/input.pro
	src/logic/qframeaction.h
	src/plugins/sceneparsers/assimp/assimp.pro
	src/quick3d/imports/input/importsinput.pro
	src/quick3d/imports/render/importsrender.pro
	src/render/backend/trianglesextractor.cpp
	src/render/framegraph/qclearbuffer.h
	src/render/framegraph/qlighting.h
	src/render/framegraph/qstateset.h
	src/render/frontend/qrenderattachment.h
	src/render/geometry/qabstractattribute.h
	src/render/geometry/qabstractbuffer.h
	src/render/geometry/qattribute.h
	src/render/geometry/qboundingvolumespecifier.h
	src/render/geometry/qbuffer.h
	src/render/materialsystem/qfilterkey.h
	src/render/materialsystem/qparameter.h
	src/render/materialsystem/qparametermapping.h
	src/render/renderstates/qblendstate.h
	src/render/renderstates/qdepthmask.h
	src/render/renderstates/qpointsize.cpp
	src/render/renderstates/qrenderstatecreatedchange.cpp
	src/render/renderstates/qstencilop.h
	src/render/renderstates/qstencilopseparate.h
	src/render/renderstates/qstenciltestseparate.h
	src/render/texture/qabstracttexture.h
	src/render/texture/qabstracttextureimage.h
	src/render/texture/qtextureproviders.h

Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4

10 files changed, 17 insertions, 27 deletions

diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro
index e79e5c1eb..ccd557a18 100644
--- a/src/quick3d/imports/input/importsinput.pro
+++ b/src/quick3d/imports/input/importsinput.pro
@@ -6,8 +6,6 @@ QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private
 
 OTHER_FILES += qmldir
 
-load(qml_plugin)
-
 HEADERS += \
     qt3dquick3dinputplugin.h
 
@@ -15,3 +13,5 @@ SOURCES += \
     qt3dquick3dinputplugin.cpp
 
 qtHaveModule(gamepad): DEFINES += HAVE_QGAMEPAD
+
+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 a17f602c4..571092e03 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -14,7 +14,7 @@ include(./defaults/defaults.pri)
 
 OTHER_FILES += qmldir
 
-load(qml_plugin)
+include(./defaults/defaults.pri)
 
 OTHER_FILES += \
     $$QML_FILES
@@ -40,3 +40,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/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h
index b41f3b9f7..5d93649d9 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.h
+++ b/src/quick3d/quick3d/qqmlaspectengine.h
@@ -57,7 +57,7 @@ class QT3DQUICKSHARED_EXPORT QQmlAspectEngine: public QObject
 public:
     enum Status { Null, Ready, Loading, Error };
 
-    explicit QQmlAspectEngine(QObject *parent = 0);
+    explicit QQmlAspectEngine(QObject *parent = Q_NULLPTR);
 
     Status status() const;
     void setSource(const QUrl &source);
diff --git a/src/quick3d/quick3d/qt3dquick_global.h b/src/quick3d/quick3d/qt3dquick_global.h
index 76f4324da..125eae656 100644
--- a/src/quick3d/quick3d/qt3dquick_global.h
+++ b/src/quick3d/quick3d/qt3dquick_global.h
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICK_LIBRARY)
+#  if defined(QT_BUILD_3DQUICK_LIB)
 #    define QT3DQUICKSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index a1d26a0ca..9e5ffbfdd 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -1,12 +1,7 @@
 TARGET   = Qt3DQuick
-
-QT      += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private
-
-DEFINES += QT3DQUICK_LIBRARY
-
 MODULE   = 3dquick
 
-load(qt_module)
+QT      += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private
 
 gcov {
     CONFIG += static
@@ -37,3 +32,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)
diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global.h b/src/quick3d/quick3dinput/qt3dquickinput_global.h
index 69f1cff29..58a73974a 100644
--- a/src/quick3d/quick3dinput/qt3dquickinput_global.h
+++ b/src/quick3d/quick3dinput/qt3dquickinput_global.h
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICKINPUT_LIBRARY)
+#  if defined(QT_BUILD_3DQUICKINPUT_LIB)
 #    define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
index f32dde78f..59339449e 100644
--- a/src/quick3d/quick3dinput/quick3dinput.pro
+++ b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -1,14 +1,9 @@
 TARGET   = Qt3DQuickInput
+MODULE   = 3dquickinput
 
 QT      += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private
 CONFIG -= precompile_header
 
-DEFINES += QT3DQUICKINPUT_LIBRARY
-
-MODULE   = 3dquickinput
-
-load(qt_module)
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -32,3 +27,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h
index eea08a7e0..1e06c7043 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.h
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICKRENDER_LIBRARY)
+#  if defined(QT_BUILD_3DQUICKRENDER_LIB)
 #    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index 3a723f1e3..f9d711dd6 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -1,14 +1,9 @@
 TARGET   = Qt3DQuickRender
+MODULE   = 3dquickrender
 
 QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-DEFINES += QT3DQUICKRENDER_LIBRARY
-
-MODULE   = 3dquickrender
-
-load(qt_module)
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -31,3 +26,4 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 
 include(./items/items.pri)
 
+load(qt_module)