diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
| commit | c38ba06bbc139b1d070bf279bc9e05384ece1e87 (patch) | |
| tree | 85093824bba8fe333ca93e5184aca00e8e7f3220 | |
| parent | caeb69e2401fe4e8e4d7dfa34e39eee941478a9e (diff) | |
| parent | 78973b481c3cfb6db2511f0487d1045ad16a21eb (diff) | |
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
127 files changed, 213 insertions, 223 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/images/normalmap.png b/examples/qt3d/audio-visualizer-qml/images/normalmap.png Binary files differindex be522bbf9..0c3941c4e 100644 --- a/examples/qt3d/audio-visualizer-qml/images/normalmap.png +++ b/examples/qt3d/audio-visualizer-qml/images/normalmap.png diff --git a/examples/qt3d/audio-visualizer-qml/images/songtitle.png b/examples/qt3d/audio-visualizer-qml/images/songtitle.png Binary files differindex 1f47b971f..2a9961093 100644 --- a/examples/qt3d/audio-visualizer-qml/images/songtitle.png +++ b/examples/qt3d/audio-visualizer-qml/images/songtitle.png diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp index f55705395..0dd6d36d9 100644 --- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp +++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp @@ -45,8 +45,7 @@ TouchSettings::TouchSettings(QObject *parent) bool TouchSettings::isHoverEnabled() const { -#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) - || defined(Q_OS_WINRT) +#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WINRT) return false; #else bool isTouch = false; diff --git a/examples/qt3d/examples-common/qorbitcontrol.h b/examples/qt3d/examples-common/qorbitcontrol.h index a99e38b66..dbfc6e08d 100644 --- a/examples/qt3d/examples-common/qorbitcontrol.h +++ b/examples/qt3d/examples-common/qorbitcontrol.h @@ -58,7 +58,7 @@ class QOrbitControl : public Qt3DCore::QEntity Q_PROPERTY(float zoomInLimit READ zoomInLimit WRITE setZoomInLimit NOTIFY zoomInLimitChanged) public: - explicit QOrbitControl(Qt3DCore::QNode *parent = Q_NULLPTR); + explicit QOrbitControl(Qt3DCore::QNode *parent = nullptr); ~QOrbitControl(); float clampInputs(float input1, float input2); diff --git a/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png Binary files differindex c62530326..bd5939f42 100644 --- a/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png +++ b/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png diff --git a/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png Binary files differindex c62530326..bd5939f42 100644 --- a/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png +++ b/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png diff --git a/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png Binary files differindex c62530326..bd5939f42 100644 --- a/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png +++ b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png diff --git a/examples/qt3d/planets-qml/images/galaxy_starfield.png b/examples/qt3d/planets-qml/images/galaxy_starfield.png Binary files differindex 67d808aa6..36a762e3c 100644 --- a/examples/qt3d/planets-qml/images/galaxy_starfield.png +++ b/examples/qt3d/planets-qml/images/galaxy_starfield.png diff --git a/examples/qt3d/planets-qml/images/saturnringcolortrans.png b/examples/qt3d/planets-qml/images/saturnringcolortrans.png Binary files differindex ad0073382..48a9a5911 100644 --- a/examples/qt3d/planets-qml/images/saturnringcolortrans.png +++ b/examples/qt3d/planets-qml/images/saturnringcolortrans.png diff --git a/examples/qt3d/planets-qml/images/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/uranusringcolortrans.png Binary files differindex 5a7a4a3a6..13a5f1558 100644 --- a/examples/qt3d/planets-qml/images/uranusringcolortrans.png +++ b/examples/qt3d/planets-qml/images/uranusringcolortrans.png diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index fa5206eac..ba0920833 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -19,18 +19,23 @@ contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER -# Stop compiler complaining about ignored qualifiers on return types intel_icc: { + # warning #310: old-style parameter list (anachronism) + QMAKE_CFLAGS_WARN_ON += -wd310 + + # warning #68: integer conversion resulted in a change of sign + QMAKE_CFLAGS_WARN_ON += -wd68 + + # warning #858: type qualifier on return type is meaningless QMAKE_CFLAGS_WARN_ON += -wd858 + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -} gcc|clang: { +} else:gcc|clang: { + # Stop compiler complaining about ignored qualifiers on return types QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function -Wno-reorder QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON } -# warning #310: old-style parameter list (anachronism) -intel_icc: QMAKE_CFLAGS_WARN_ON += -wd310 - CONFIG += warn_on VPATH += \ diff --git a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp index 0ff61d9c3..3c1dd7b33 100644 --- a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp +++ b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp @@ -275,7 +275,7 @@ namespace boost { // Constructs a tuple with 0 elements (well ...) inline tuple <> make_tuple () { - tuple <> t; + tuple <> t = tuple <> (); return t; } }; diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 3fd33a301..958a66bb7 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -65,10 +65,10 @@ class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject Q_OBJECT public: - explicit QAbstractAspect(QObject *parent = 0); + explicit QAbstractAspect(QObject *parent = Q_NULLPTR); protected: - QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0); + QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = Q_NULLPTR); QNodeId rootEntityId() const Q_DECL_NOEXCEPT; diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index 4401da606..b884b93a7 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT QAspectEngine : public QObject { Q_OBJECT public: - explicit QAspectEngine(QObject *parent = 0); + explicit QAspectEngine(QObject *parent = Q_NULLPTR); ~QAspectEngine(); void setRootEntity(QEntityPtr root); diff --git a/src/core/core.pro b/src/core/core.pro index ca852e2a1..a32a6eaf3 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -1,10 +1,7 @@ TARGET = Qt3DCore MODULE = 3dcore -QT = core-private gui-private - -load(qt_module) -DEFINES += QT3DCORE_LIBRARY +QT = core-private gui-private gcov { CONFIG += static @@ -18,3 +15,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/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h index dd4cc70de..33d05455c 100644 --- a/src/core/jobs/qabstractaspectjobmanager_p.h +++ b/src/core/jobs/qabstractaspectjobmanager_p.h @@ -59,11 +59,11 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QAbstractAspectJobManager : public QObject +class QT3DCORESHARED_EXPORT QAbstractAspectJobManager : public QObject { Q_OBJECT public: - explicit QAbstractAspectJobManager(QObject *p = 0); + explicit QAbstractAspectJobManager(QObject *p = Q_NULLPTR); virtual void initialize() {} virtual void enqueueJobs(const QVector<QAspectJobPtr> &jobQueue) = 0; diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index 6593883e6..070959148 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QComponent : public QNode Q_PROPERTY(bool isShareable READ isShareable WRITE setShareable NOTIFY shareableChanged) public: - explicit QComponent(QNode *parent = 0); + explicit QComponent(QNode *parent = Q_NULLPTR); ~QComponent(); bool isShareable() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void shareableChanged(bool isShareable); protected: - QComponent(QComponentPrivate &dd, QNode *parent = 0); + QComponent(QComponentPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h index eecca56c1..a84758857 100644 --- a/src/core/nodes/qentity.h +++ b/src/core/nodes/qentity.h @@ -58,7 +58,7 @@ class QT3DCORESHARED_EXPORT QEntity : public QNode { Q_OBJECT public: - explicit QEntity(QNode *parent = 0); + explicit QEntity(QNode *parent = Q_NULLPTR); virtual ~QEntity(); QComponentVector components() const; @@ -69,7 +69,7 @@ public: QEntity *parentEntity() const; protected: - QEntity(QEntityPrivate &dd, QNode *parent = 0); + QEntity(QEntityPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 595992604..dc4736df2 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -80,7 +80,7 @@ class QT3DCORESHARED_EXPORT QNode : public QObject Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QNode(QNode *parent = 0); + explicit QNode(QNode *parent = Q_NULLPTR); virtual ~QNode(); const QNodeId id() const; @@ -105,7 +105,7 @@ protected: // Clone should only be made in the main thread static QNode *clone(QNode *node); - QNode(QNodePrivate &dd, QNode *parent = 0); + QNode(QNodePrivate &dd, QNode *parent = Q_NULLPTR); virtual void copy(const QNode *ref); virtual void sceneChangeEvent(const QSceneChangePtr &change); diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h index 518085937..55ea7e81a 100644 --- a/src/core/qt3dcore_global.h +++ b/src/core/qt3dcore_global.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DCORE_LIBRARY) +# if defined(QT_BUILD_3DCORE_LIB) # define QT3DCORESHARED_EXPORT Q_DECL_EXPORT # else # define QT3DCORESHARED_EXPORT Q_DECL_IMPORT diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index 73eff5b8a..c77217e07 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -64,7 +64,7 @@ class QT3DCORESHARED_EXPORT QTransform : public QComponent Q_PROPERTY(float rotationZ READ rotationZ WRITE setRotationZ NOTIFY rotationZChanged) public: - explicit QTransform(QNode *parent = 0); + explicit QTransform(QNode *parent = Q_NULLPTR); ~QTransform(); float scale() const; @@ -114,7 +114,7 @@ Q_SIGNALS: void rotationZChanged(float rotationZ); protected: - QTransform(QTransformPrivate &dd, QNode *parent = 0); + QTransform(QTransformPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/doc/images/deferred-framegraph.png b/src/doc/images/deferred-framegraph.png Binary files differindex 913539d50..0020e10e6 100644 --- a/src/doc/images/deferred-framegraph.png +++ b/src/doc/images/deferred-framegraph.png diff --git a/src/doc/images/framegraph-parallel-build.png b/src/doc/images/framegraph-parallel-build.png Binary files differindex fe3fdd176..8ae5ed5a6 100644 --- a/src/doc/images/framegraph-parallel-build.png +++ b/src/doc/images/framegraph-parallel-build.png diff --git a/src/doc/images/multiviewport-1.png b/src/doc/images/multiviewport-1.png Binary files differindex 27b9c04d5..69a9ed32e 100644 --- a/src/doc/images/multiviewport-1.png +++ b/src/doc/images/multiviewport-1.png diff --git a/src/doc/images/multiviewport-2.png b/src/doc/images/multiviewport-2.png Binary files differindex 397cde96f..47056cf5c 100644 --- a/src/doc/images/multiviewport-2.png +++ b/src/doc/images/multiviewport-2.png diff --git a/src/doc/images/simple-framegraph.png b/src/doc/images/simple-framegraph.png Binary files differindex 334e995f0..7a57ca139 100644 --- a/src/doc/images/simple-framegraph.png +++ b/src/doc/images/simple-framegraph.png diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h index 00a63883a..1836c0e9d 100644 --- a/src/input/frontend/qabstractphysicaldevice.h +++ b/src/input/frontend/qabstractphysicaldevice.h @@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode { Q_OBJECT public: - explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = 0); + explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAbstractPhysicalDevice(); virtual int axisCount() const; @@ -73,7 +73,7 @@ public: QVector<QAxisSetting *> axisSettings() const; protected: - QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = 0); + QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); Q_DECLARE_PRIVATE(QAbstractPhysicalDevice) void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h index 1f09330af..cde17ab6a 100644 --- a/src/input/frontend/qinputaspect.h +++ b/src/input/frontend/qinputaspect.h @@ -55,7 +55,8 @@ class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: - explicit QInputAspect(QObject *parent = 0); + explicit QInputAspect(QObject *parent = nullptr); + QAbstractPhysicalDevice *createPhysicalDevice(const QString &name); QStringList availablePhysicalDevices() const; diff --git a/src/input/frontend/qinputdeviceintegration.h b/src/input/frontend/qinputdeviceintegration.h index 67b139ac6..e6aa7540f 100644 --- a/src/input/frontend/qinputdeviceintegration.h +++ b/src/input/frontend/qinputdeviceintegration.h @@ -65,8 +65,8 @@ class QT3DINPUTSHARED_EXPORT QInputDeviceIntegration : public QObject { Q_OBJECT protected: - explicit QInputDeviceIntegration(QObject *parent = 0); - explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = 0); + explicit QInputDeviceIntegration(QObject *parent = Q_NULLPTR); + explicit QInputDeviceIntegration(QInputDeviceIntegrationPrivate &dd, QObject *parent = Q_NULLPTR); template<class Frontend> void registerBackendType(const Qt3DCore::QBackendNodeMapperPtr &functor) diff --git a/src/input/frontend/qinputdeviceintegrationfactory_p.h b/src/input/frontend/qinputdeviceintegrationfactory_p.h index 74415ccb4..e3d775932 100644 --- a/src/input/frontend/qinputdeviceintegrationfactory_p.h +++ b/src/input/frontend/qinputdeviceintegrationfactory_p.h @@ -67,7 +67,7 @@ public: static QInputDeviceIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString()); }; -} // Qt3DRender +} // Qt3DInput QT_END_NAMESPACE diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h index f08c80d03..6bb195fee 100644 --- a/src/input/frontend/qkeyboardhandler.h +++ b/src/input/frontend/qkeyboardhandler.h @@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent Q_PROPERTY(Qt3DInput::QKeyboardDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) public: - explicit QKeyboardHandler(QNode *parent = 0); + explicit QKeyboardHandler(QNode *parent = nullptr); ~QKeyboardHandler(); Qt3DInput::QKeyboardDevice *sourceDevice() const; diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h index 30152e7da..15a82acab 100644 --- a/src/input/frontend/qmousedevice.h +++ b/src/input/frontend/qmousedevice.h @@ -58,8 +58,9 @@ class QT3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalD Q_OBJECT Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged) public: - explicit QMouseDevice(Qt3DCore::QNode *parent = 0); + explicit QMouseDevice(Qt3DCore::QNode *parent = nullptr); ~QMouseDevice(); + enum Axis { X, Y diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp index 31785e609..b14e2bb34 100644 --- a/src/input/frontend/qmouseevent.cpp +++ b/src/input/frontend/qmouseevent.cpp @@ -132,13 +132,13 @@ QMouseEvent::~QMouseEvent() QMouseEvent::Buttons QMouseEvent::button() const { switch (m_event.button()) { - case Qt::MouseButton::LeftButton: + case Qt::LeftButton: return QMouseEvent::LeftButton; - case Qt::MouseButton::RightButton: + case Qt::RightButton: return QMouseEvent::RightButton; - case Qt::MouseButton::MiddleButton: + case Qt::MiddleButton: return QMouseEvent::MiddleButton; - case Qt::MouseButton::BackButton: + case Qt::BackButton: return QMouseEvent::BackButton; default: return QMouseEvent::NoButton; diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h index 211313a0a..d837268e8 100644 --- a/src/input/frontend/qmousehandler.h +++ b/src/input/frontend/qmousehandler.h @@ -58,7 +58,7 @@ class QT3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged) public: - explicit QMouseHandler(QNode *parent = 0); + explicit QMouseHandler(QNode *parent = nullptr); ~QMouseHandler(); QMouseDevice *sourceDevice() const; diff --git a/src/input/input.pro b/src/input/input.pro index 1c1ad8611..938e77643 100644 --- a/src/input/input.pro +++ b/src/input/input.pro @@ -1,13 +1,11 @@ TARGET = Qt3DInput -QT += core core-private 3dcore 3dcore-private 3drender 3dlogic - DEFINES += QT3DINPUT_LIBRARY MODULE = 3dinput MODULE_PLUGIN_TYPES = 3dinputdevices -load(qt_module) +QT += core-private 3dcore-private include(frontend/frontend.pri) include(backend/backend.pri) @@ -15,3 +13,5 @@ include(backend/backend.pri) HEADERS += \ qt3dinput_global.h \ qt3dinput_global_p.h + +load(qt_module) diff --git a/src/input/qt3dinput_global.h b/src/input/qt3dinput_global.h index ccac8dccf..5b05129b6 100644 --- a/src/input/qt3dinput_global.h +++ b/src/input/qt3dinput_global.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DINPUT_LIBRARY) +# if defined(QT_BUILD_3DINPUT_LIB) # define QT3DINPUTSHARED_EXPORT Q_DECL_EXPORT # else # define QT3DINPUTSHARED_EXPORT Q_DECL_IMPORT diff --git a/src/logic/logic.pro b/src/logic/logic.pro index 9ed6349f8..4facdda3d 100644 --- a/src/logic/logic.pro +++ b/src/logic/logic.pro @@ -1,10 +1,7 @@ TARGET = Qt3DLogic MODULE = 3dlogic -QT = core-private gui-private 3dcore 3dcore-private - -load(qt_module) -DEFINES += QT3DLOGIC_LIBRARY +QT = core-private gui-private 3dcore 3dcore-private gcov { CONFIG += static @@ -16,3 +13,5 @@ gcov { win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x include(logic.pri) + +load(qt_module) diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h index 52ef1b9b0..a9aae346d 100644 --- a/src/logic/qframeaction.h +++ b/src/logic/qframeaction.h @@ -59,11 +59,11 @@ class QT3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent Q_OBJECT public: - explicit QFrameAction(Qt3DCore::QNode *parent = 0); + explicit QFrameAction(Qt3DCore::QNode *parent = nullptr); ~QFrameAction(); protected: - QFrameAction(QFrameActionPrivate &dd, QNode *parent = 0); + QFrameAction(QFrameActionPrivate &dd, QNode *parent = nullptr); Q_SIGNALS: void triggered(float dt); diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h index 6d5200b80..60e2e5753 100644 --- a/src/logic/qlogicaspect.h +++ b/src/logic/qlogicaspect.h @@ -53,7 +53,7 @@ class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: - explicit QLogicAspect(QObject *parent = 0); + explicit QLogicAspect(QObject *parent = Q_NULLPTR); QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; diff --git a/src/logic/qt3dlogic_global.h b/src/logic/qt3dlogic_global.h index b1895d8ae..baf3f2aea 100644 --- a/src/logic/qt3dlogic_global.h +++ b/src/logic/qt3dlogic_global.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DLOGIC_LIBRARY) +# if defined(QT_BUILD_3DLOGIC_LIB) # define QT3DLOGICSHARED_EXPORT Q_DECL_EXPORT # else # define QT3DLOGICSHARED_EXPORT Q_DECL_IMPORT diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index f1cee4607..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 = AssimpSceneParserPlugin -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 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) diff --git a/src/render/backend/trianglesextractor.cpp b/src/render/backend/trianglesextractor.cpp index d533f9cae..280898b55 100644 --- a/src/render/backend/trianglesextractor.cpp +++ b/src/render/backend/trianglesextractor.cpp @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { - namespace Render { TrianglesExtractor::TrianglesExtractor(GeometryRenderer *renderer, NodeManagers *manager) @@ -76,7 +75,6 @@ void TrianglesExtractor::visit(uint andx, const QVector3D &a, uint bndx, const Q } } // namespace Render - } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index a78e19a36..cf30630ae 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index b80f2c17f..ebeda9860 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseSpecularMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h index 4ab36a9ab..e256affd6 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/render/defaults/qforwardrenderer.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QForwardRenderer(Qt3DCore::QNode *parent = 0); + explicit QForwardRenderer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QForwardRenderer(); QRectF viewportRect() const; diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index bc7953f9d..7b4865734 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -60,7 +60,7 @@ QGoochMaterialPrivate::QGoochMaterialPrivate() , m_coolParameter(new QParameter(QStringLiteral("kblue"), QColor::fromRgbF(0.0f, 0.0f, 0.4f))) , m_warmParameter(new QParameter(QStringLiteral("kyellow"), QColor::fromRgbF(0.4f, 0.4f, 0.0f))) , m_alphaParameter(new QParameter(QStringLiteral("alpha"), 0.25f)) - , m_betaParameter(new QParameter(QStringLiteral("alpha"), 0.5f)) + , m_betaParameter(new QParameter(QStringLiteral("beta"), 0.5f)) , m_shininessParameter(new QParameter(QStringLiteral("shininess"), 100.0f)) , m_gl3Technique(new QTechnique) , m_gl2Technique(new QTechnique) diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h index fe3320ae0..3a6bfdd51 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/render/defaults/qgoochmaterial.h @@ -61,7 +61,7 @@ class QT3DRENDERSHARED_EXPORT QGoochMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QGoochMaterial(Qt3DCore::QNode *parent = 0); + explicit QGoochMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); QColor diffuse() const; QColor specular() const; QColor cool() const; @@ -89,7 +89,7 @@ Q_SIGNALS: void shininessChanged(float shininess); protected: - QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QGoochMaterial) diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h index c5fbba795..3decf2ebb 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h @@ -52,7 +52,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDif { Q_OBJECT public: - explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapAlphaMaterial(); private: diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 81bfb302e..4f843bd05 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -61,7 +61,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapMaterial(); QColor ambient() const; @@ -88,7 +88,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index aa4b23eaa..581ca6fb2 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMateri Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; @@ -87,7 +87,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial) diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h index e1f7db9c2..43e2a095b 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/render/defaults/qpervertexcolormaterial.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial Q_OBJECT public: - explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = 0); + explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPerVertexColorMaterial(); private: diff --git a/src/render/defaults/qphongalphamaterial.h b/src/render/defaults/qphongalphamaterial.h index c41062118..9a258b09f 100644 --- a/src/render/defaults/qphongalphamaterial.h +++ b/src/render/defaults/qphongalphamaterial.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QPhongAlphaMaterial : public QMaterial Q_PROPERTY(float alpha READ alpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongAlphaMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h index 818e2df3b..ff518e2a7 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/render/defaults/qphongmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QPhongMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h index 4cdd345ba..e52e4bcd5 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/render/defaults/qskyboxentity.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: - explicit QSkyboxEntity(Qt3DCore::QNode *parent = 0); + explicit QSkyboxEntity(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSkyboxEntity(); void setBaseName(const QString &path); diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index f984356c1..34957e5f2 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(Qt3DCore::QNode *parent = 0); + explicit QCameraSelector(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCameraSelector(); Qt3DCore::QEntity *camera() const; @@ -67,7 +67,7 @@ Q_SIGNALS: void cameraChanged(Qt3DCore::QEntity *camera); protected: - QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index b75ada52e..5d4441204 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -54,13 +54,13 @@ class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT public: - explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0); + explicit QFrameGraphNode(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QFrameGraphNode) diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 2dfe69e60..470b74a45 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(Qt3DCore::QNode *parent = 0); + explicit QLayerFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLayerFilter(); QStringList layers() const; @@ -66,7 +66,7 @@ Q_SIGNALS: void layersChanged(const QStringList &layers); protected: - QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 531ff184d..fbe401103 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(Qt3DCore::QNode *parent = 0); + explicit QNoDraw(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNoDraw(); private: diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index ca137e10d..51d9ba216 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0); + explicit QRenderPassFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderPassFilter(); QVector<QFilterKey*> matchAny() const; @@ -70,7 +70,7 @@ public: QVector<QParameter *> parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index b66a57f6e..158a78365 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(Qt3DCore::QNode *parent = 0); + explicit QRenderTargetSelector(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderTargetSelector(); QRenderTarget *target() const; @@ -72,7 +72,7 @@ Q_SIGNALS: void targetChanged(QRenderTarget *target); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index b98ba6c37..68f480b38 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(Qt3DCore::QNode *parent = 0); + explicit QSortCriterion(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSortCriterion(); enum SortType { @@ -73,7 +73,7 @@ Q_SIGNALS: void sortChanged(SortType sort); protected: - QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0); + QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index f982e446e..52bea3ffa 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0); + explicit QTechniqueFilter(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTechniqueFilter(); QVector<QFilterKey*> criteria() const; @@ -67,7 +67,7 @@ public: QVector<QParameter *> parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 4e88cc1c1..85ef65a9c 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QRectF normalizedRect READ normalizedRect WRITE setNormalizedRect NOTIFY normalizedRectChanged) public: - explicit QViewport(Qt3DCore::QNode *parent = 0); + explicit QViewport(Qt3DCore::QNode *parent = Q_NULLPTR); ~QViewport(); QRectF normalizedRect() const; @@ -68,7 +68,7 @@ Q_SIGNALS: void normalizedRectChanged(const QRectF& normalizedRect); protected: - QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = 0); + QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h index 885550ad7..715b43de8 100644 --- a/src/render/frontend/qabstractfunctor.h +++ b/src/render/frontend/qabstractfunctor.h @@ -56,7 +56,7 @@ struct FunctorType // The MSVC linker can under some cases optimize all the template // functions into a single function. The code below is there to ensure // that the linker won't collapse all these distincts functions into one - static T *t = 0; + static T *t = Q_NULLPTR; return reinterpret_cast<qintptr>(t); } }; diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index 2cb4bfadc..809cc8833 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -80,7 +80,7 @@ class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity Q_PROPERTY(QMatrix4x4 viewMatrix READ viewMatrix NOTIFY viewMatrixChanged) public: - explicit QCamera(QNode *parent = 0); + explicit QCamera(QNode *parent = Q_NULLPTR); ~QCamera(); enum CameraTranslationOption { @@ -167,7 +167,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QCamera) QT3D_CLONEABLE(QCamera) - QCamera(QCameraPrivate &dd, QNode *parent = 0); + QCamera(QCameraPrivate &dd, QNode *parent = Q_NULLPTR); }; } // namespace Qt3DRender diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index dacf43def..7788d72e4 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -68,7 +68,7 @@ class QT3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent Q_PROPERTY(QMatrix4x4 projectionMatrix READ projectionMatrix WRITE setProjectionMatrix NOTIFY projectionMatrixChanged) public: - explicit QCameraLens(QNode *parent = 0); + explicit QCameraLens(QNode *parent = Q_NULLPTR); ~QCameraLens(); enum ProjectionType { @@ -127,7 +127,7 @@ Q_SIGNALS: void projectionMatrixChanged(const QMatrix4x4 &projectionMatrix); protected: - QCameraLens(QCameraLensPrivate &dd, QNode *parent = 0); + QCameraLens(QCameraLensPrivate &dd, QNode *parent = Q_NULLPTR); void copy(const QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 233382d7f..72b34fc50 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) public: - explicit QLayer(Qt3DCore::QNode *parent = 0); + explicit QLayer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLayer(); QStringList names() const; @@ -67,7 +67,7 @@ Q_SIGNALS: void namesChanged(const QStringList &names); protected: - QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = 0); + QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index 181e2b96a..ae7cee5ba 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -64,8 +64,8 @@ public: Threaded }; - explicit QRenderAspect(QObject *parent = 0); - explicit QRenderAspect(RenderType type, QObject *parent = 0); + explicit QRenderAspect(QObject *parent = Q_NULLPTR); + explicit QRenderAspect(RenderType type, QObject *parent = Q_NULLPTR); QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 418e78863..f58274f04 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QRenderTarget(Qt3DCore::QNode *parent = 0); + explicit QRenderTarget(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderTarget(); void addOutput(QRenderTargetOutput *output); @@ -62,7 +62,7 @@ public: QVector<QRenderTargetOutput *> outputs() const; protected: - QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index be1b188d0..ebb2d9a55 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -85,7 +85,7 @@ public: }; Q_ENUM(UsageType) - explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = 0); + explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = Q_NULLPTR); ~QBuffer(); UsageType usage() const; diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h index 920c6aed2..5db062cbd 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/render/geometry/qcuboidmesh.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged) public: - explicit QCuboidMesh(Qt3DCore::QNode *parent = 0); + explicit QCuboidMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCuboidMesh(); float xExtent() const; diff --git a/src/render/geometry/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h index 7903e8767..37f46b76b 100644 --- a/src/render/geometry/qcylindergeometry.h +++ b/src/render/geometry/qcylindergeometry.h @@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: - explicit QCylinderGeometry(QNode *parent = 0); + explicit QCylinderGeometry(QNode *parent = Q_NULLPTR); ~QCylinderGeometry(); void updateVertices(); @@ -92,7 +92,7 @@ Q_SIGNALS: void lengthChanged(float length); protected: - QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = 0); + QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QCylinderGeometry) diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h index c26fa9ddd..6af1a62b1 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/render/geometry/qcylindermesh.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: - explicit QCylinderMesh(Qt3DCore::QNode *parent = 0); + explicit QCylinderMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCylinderMesh(); int rings() const; diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index 58f7f50ac..b392d7866 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged) public: - explicit QGeometry(Qt3DCore::QNode *parent = 0); + explicit QGeometry(Qt3DCore::QNode *parent = Q_NULLPTR); ~QGeometry(); QVector<QAttribute *> attributes() const; @@ -71,7 +71,7 @@ Q_SIGNALS: void boundingVolumePositionAttributeChanged(QAttribute *boundingVolumePositionAttribute); protected: - QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = 0); + QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 2b348b952..8a2e85459 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -67,7 +67,7 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) public: - explicit QGeometryRenderer(Qt3DCore::QNode *parent = 0); + explicit QGeometryRenderer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QGeometryRenderer(); enum PrimitiveType { @@ -125,7 +125,7 @@ Q_SIGNALS: void primitiveTypeChanged(PrimitiveType primitiveType); protected: - QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0); + QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index 1b1db98ca..36778f6ad 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -61,7 +61,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer Q_PROPERTY(QString meshName READ meshName WRITE setMeshName NOTIFY meshNameChanged) public: - explicit QMesh(Qt3DCore::QNode *parent = 0); + explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QMesh(); QUrl source() const; @@ -76,7 +76,7 @@ Q_SIGNALS: void meshNameChanged(const QString &meshName); protected: - QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0); + QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QMesh) diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h index 5cb4686ca..db0f43109 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/render/geometry/qplanemesh.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged) public: - explicit QPlaneMesh(Qt3DCore::QNode *parent = 0); + explicit QPlaneMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPlaneMesh(); float width() const; diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h index a3218bc1d..ee76ae110 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/render/geometry/qspheremesh.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged) public: - explicit QSphereMesh(Qt3DCore::QNode *parent = 0); + explicit QSphereMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSphereMesh(); int rings() const; diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h index 220bb257e..64c5f885d 100644 --- a/src/render/geometry/qtorusgeometry.h +++ b/src/render/geometry/qtorusgeometry.h @@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: - explicit QTorusGeometry(QNode *parent = 0); + explicit QTorusGeometry(QNode *parent = Q_NULLPTR); ~QTorusGeometry(); void updateVertices(); @@ -93,7 +93,7 @@ Q_SIGNALS: protected: - QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = 0); + QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QTorusGeometry) diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h index b41f6449c..6783c6833 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/render/geometry/qtorusmesh.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: - explicit QTorusMesh(Qt3DCore::QNode *parent = 0); + explicit QTorusMesh(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTorusMesh(); int rings() const; diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index e6003ec01..96aade339 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QSceneLoader(Qt3DCore::QNode *parent = 0); + explicit QSceneLoader(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSceneLoader(); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; diff --git a/src/render/io/qsceneparserplugin.h b/src/render/io/qsceneparserplugin.h index 43f06d998..276b7607f 100644 --- a/src/render/io/qsceneparserplugin.h +++ b/src/render/io/qsceneparserplugin.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QSceneParserPlugin : public QObject { Q_OBJECT public: - explicit QSceneParserPlugin(QObject *parent = 0); + explicit QSceneParserPlugin(QObject *parent = Q_NULLPTR); ~QSceneParserPlugin(); virtual QSceneIOHandler *create(const QString &key, const QStringList ¶mList); diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index 0b88bcd61..636a5a00b 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QLight Q_PROPERTY(QVector3D worldDirection READ worldDirection WRITE setWorldDirection NOTIFY worldDirectionChanged) public: - explicit QDirectionalLight(Qt3DCore::QNode *parent = 0); + explicit QDirectionalLight(Qt3DCore::QNode *parent = Q_NULLPTR); QVector3D worldDirection() const; @@ -65,7 +65,7 @@ Q_SIGNALS: void worldDirectionChanged(const QVector3D &worldDirection); protected: - QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/lights/qlight.h b/src/render/lights/qlight.h index 9375ed1fd..45c51aa66 100644 --- a/src/render/lights/qlight.h +++ b/src/render/lights/qlight.h @@ -67,7 +67,7 @@ public : }; Q_ENUM(Type) - explicit QLight(Qt3DCore::QNode *parent = 0); + explicit QLight(Qt3DCore::QNode *parent = Q_NULLPTR); ~QLight(); Type type() const; @@ -80,7 +80,7 @@ public Q_SLOTS: void setIntensity(float intensity); protected : - QLight(QLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QLight(QLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 054d9d7c1..7298997d2 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPointLight : public QLight Q_PROPERTY(float quadraticAttenuation READ quadraticAttenuation WRITE setQuadraticAttenuation NOTIFY quadraticAttenuationChanged) public: - explicit QPointLight(Qt3DCore::QNode *parent = 0); + explicit QPointLight(Qt3DCore::QNode *parent = Q_NULLPTR); float constantAttenuation() const; float linearAttenuation() const; diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index 4a0dfc5f0..3a477c4e4 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QSpotLight : public QLight Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged) public: - explicit QSpotLight(Qt3DCore::QNode *parent = 0); + explicit QSpotLight(Qt3DCore::QNode *parent = Q_NULLPTR); QVector3D attenuation() const; QVector3D localDirection() const; @@ -82,7 +82,7 @@ Q_SIGNALS: void cutOffAngleChanged(float cutOffAngle); protected: - QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = 0); + QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 0d5f2ad4c..647542c85 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode { Q_OBJECT public: - explicit QEffect(Qt3DCore::QNode *parent = 0); + explicit QEffect(Qt3DCore::QNode *parent = Q_NULLPTR); ~QEffect(); void addParameter(QParameter *parameter); @@ -67,7 +67,7 @@ public: QVector<QTechnique *> techniques() const; protected: - QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0); + QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h index b8d30d65a..df4cdeedc 100644 --- a/src/render/materialsystem/qfilterkey.h +++ b/src/render/materialsystem/qfilterkey.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - explicit QFilterKey(Qt3DCore::QNode *parent = 0); + explicit QFilterKey(Qt3DCore::QNode *parent = nullptr); ~QFilterKey(); QVariant value() const; diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index c97269540..237909d52 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -76,7 +76,7 @@ public: }; Q_ENUM(OpenGLProfile) - explicit QGraphicsApiFilter(QObject *parent = 0); + explicit QGraphicsApiFilter(QObject *parent = Q_NULLPTR); void copy(const QGraphicsApiFilter &ref); diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index 5fb252a55..eadc4a0c9 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3DCore::QNode *parent = 0); + explicit QMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QMaterial(); QEffect *effect() const; @@ -76,7 +76,7 @@ Q_SIGNALS: void effectChanged(QEffect *effect); protected: - QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 48ba6fe7c..717b9bc0f 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -58,17 +58,13 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(Qt3DCore::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = nullptr); ~QParameter(); - QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = 0); - QParameter(const QString &name, QAbstractTexture *texture, Qt3DCore::QNode *parent = 0); - QString name() const; + QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = nullptr); + QParameter(const QString &name, QAbstractTexture *texture, Qt3DCore::QNode *parent = nullptr); - /** - * @brief setDefaultValue - for non-texture uniform parameters - * @param dv - */ + QString name() const; QVariant value() const; public Q_SLOTS: @@ -80,7 +76,7 @@ Q_SIGNALS: void nameChanged(const QString &name); protected: - QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = nullptr); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 71bc325ed..143121e7f 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -65,7 +65,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) public: - explicit QRenderPass(Qt3DCore::QNode *parent = 0); + explicit QRenderPass(Qt3DCore::QNode *parent = Q_NULLPTR); ~QRenderPass(); QShaderProgram *shaderProgram() const; @@ -89,7 +89,7 @@ Q_SIGNALS: void shaderProgramChanged(QShaderProgram *shaderProgram); protected: - QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = 0); + QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 35eef056d..cc03aee03 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QShaderData(Qt3DCore::QNode *parent = 0); + explicit QShaderData(Qt3DCore::QNode *parent = Q_NULLPTR); ~QShaderData(); enum TransformType { @@ -75,7 +75,7 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = 0); + QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index 984dfe833..ce200abbe 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) public: - explicit QShaderProgram(Qt3DCore::QNode *parent = 0); + explicit QShaderProgram(Qt3DCore::QNode *parent = Q_NULLPTR); ~QShaderProgram(); enum ShaderType { @@ -103,7 +103,7 @@ Q_SIGNALS: void computeShaderCodeChanged(const QByteArray &computeShaderCode); protected: - QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = 0); + QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index f00e5dc41..49c624154 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -61,7 +61,7 @@ class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode Q_PROPERTY(Qt3DRender::QGraphicsApiFilter *graphicsApiFilter READ graphicsApiFilter CONSTANT) public: - explicit QTechnique(Qt3DCore::QNode *parent = 0); + explicit QTechnique(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTechnique(); void addFilterKey(QFilterKey*criterion); @@ -79,7 +79,7 @@ public: QGraphicsApiFilter *graphicsApiFilter(); protected: - QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0); + QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index ca8acb665..3396411d8 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -269,13 +269,13 @@ void QObjectPickerPrivate::propagateEvent(QPickEvent *event, EventType type) if ((objectPicker = qobject_cast<Qt3DRender::QObjectPicker *>(c)) != Q_NULLPTR) { QObjectPickerPrivate *objectPickerPrivate = static_cast<QObjectPickerPrivate *>(QObjectPickerPrivate::get(objectPicker)); switch (type) { - case EventType::Pressed: + case Pressed: objectPickerPrivate->pressedEvent(event); break; - case EventType::Released: + case Released: objectPickerPrivate->releasedEvent(event); break; - case EventType::Clicked: + case Clicked: objectPickerPrivate->clickedEvent(event); break; case EventType::Moved: @@ -301,7 +301,7 @@ void QObjectPickerPrivate::pressedEvent(QPickEvent *event) m_acceptedLastPressedEvent = event->isAccepted(); if (!m_acceptedLastPressedEvent) { // Travel parents to transmit the event - propagateEvent(event, EventType::Pressed); + propagateEvent(event, Pressed); } else { setPressed(true); } @@ -315,7 +315,7 @@ void QObjectPickerPrivate::clickedEvent(QPickEvent *event) Q_Q(QObjectPicker); emit q->clicked(event); if (!event->isAccepted()) - propagateEvent(event, EventType::Clicked); + propagateEvent(event, Clicked); } /*! @@ -340,7 +340,7 @@ void QObjectPickerPrivate::releasedEvent(QPickEvent *event) setPressed(false); } else { event->setAccepted(false); - propagateEvent(event, EventType::Released); + propagateEvent(event, Released); } } diff --git a/src/render/qt3drender_global.h b/src/render/qt3drender_global.h index a292249a9..77631fa8d 100644 --- a/src/render/qt3drender_global.h +++ b/src/render/qt3drender_global.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DRENDER_LIBRARY) +# if defined(QT_BUILD_3DRENDER_LIB) # define QT3DRENDERSHARED_EXPORT Q_DECL_EXPORT # else # define QT3DRENDERSHARED_EXPORT Q_DECL_IMPORT diff --git a/src/render/render.pro b/src/render/render.pro index b7a74e48e..54d9c08dd 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -1,15 +1,9 @@ TARGET = Qt3DRender - -QT += core-private gui-private 3dcore 3dcore-private openglextensions concurrent - -DEFINES += QT3DRENDER_LIBRARY - MODULE = 3drender -MODULE_PLUGIN_TYPES = \ - sceneparsers - -load(qt_module) +QT = core-private gui-private 3dcore-private +QT_PRIVATE = openglextensions +QT_FOR_PRIVATE = concurrent include (backend/render-backend.pri) include (geometry/geometry.pri) @@ -52,3 +46,7 @@ win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x SOURCES += \ renderlogging.cpp + +MODULE_PLUGIN_TYPES = \ + sceneparsers +load(qt_module) diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 1eabf3d02..7a5eb4615 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: - explicit QAlphaCoverage(Qt3DCore::QNode *parent = 0); + explicit QAlphaCoverage(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAlphaCoverage(); private: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 7ce2f0138..c7595c705 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -68,7 +68,7 @@ public: }; Q_ENUM(AlphaFunction) - explicit QAlphaTest(Qt3DCore::QNode *parent = 0); + explicit QAlphaTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QAlphaTest(); AlphaFunction alphaFunction() const; diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index 80ae11c8d..504dc99d1 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -65,7 +65,7 @@ public: }; Q_ENUM(BlendFunction) - explicit QBlendEquation(Qt3DCore::QNode *parent = 0); + explicit QBlendEquation(Qt3DCore::QNode *parent = Q_NULLPTR); ~QBlendEquation(); BlendFunction blendFunction() const; diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 2f3a81dc1..19d3eac5b 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState Q_PROPERTY(QVector3D normal READ normal WRITE setNormal NOTIFY normalChanged) Q_PROPERTY(float distance READ distance WRITE setDistance NOTIFY distanceChanged) public: - explicit QClipPlane(Qt3DCore::QNode *parent = 0); + explicit QClipPlane(Qt3DCore::QNode *parent = Q_NULLPTR); ~QClipPlane(); int planeIndex() const; diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index be2213fb5..4a0357289 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -66,7 +66,7 @@ public: }; Q_ENUM(CullingMode) - explicit QCullFace(Qt3DCore::QNode *parent = 0); + explicit QCullFace(Qt3DCore::QNode *parent = Q_NULLPTR); ~QCullFace(); CullingMode mode() const; diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index 35e4d3ceb..4d9b96a81 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -67,7 +67,7 @@ public: }; Q_ENUM(DepthFunction) - explicit QDepthTest(Qt3DCore::QNode *parent = 0); + explicit QDepthTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDepthTest(); DepthFunction depthFunction() const; diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index ddd7b7c11..68fa28139 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: - explicit QDithering(Qt3DCore::QNode *parent = 0); + explicit QDithering(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDithering(); private: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 144100476..bc205382d 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(WindingDirection) - explicit QFrontFace(Qt3DCore::QNode *parent = 0); + explicit QFrontFace(Qt3DCore::QNode *parent = Q_NULLPTR); ~QFrontFace(); WindingDirection direction() const; diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h index 8b1089bef..706d676e5 100644 --- a/src/render/renderstates/qpointsize.h +++ b/src/render/renderstates/qpointsize.h @@ -60,7 +60,7 @@ public: }; Q_ENUM(SizeMode) - explicit QPointSize(Qt3DCore::QNode *parent = 0); + explicit QPointSize(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPointSize(); SizeMode sizeMode() const; diff --git a/src/render/renderstates/qrenderstatecreatedchange.cpp b/src/render/renderstates/qrenderstatecreatedchange.cpp index 685da3a47..893e60120 100644 --- a/src/render/renderstates/qrenderstatecreatedchange.cpp +++ b/src/render/renderstates/qrenderstatecreatedchange.cpp @@ -48,7 +48,6 @@ public: : Qt3DCore::QNodeCreatedChangeBasePrivate(renderState) , m_type(QRenderStatePrivate::get(renderState)->m_type) { - } QRenderStatePrivate::Type m_type; diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index 08291a0e8..2bdd6539a 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) public: - explicit QScissorTest(Qt3DCore::QNode *parent = 0); + explicit QScissorTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QScissorTest(); int left() const; diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index 0dd3678a6..5480ba3b8 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState Q_PROPERTY(uint frontOutputMask READ frontOutputMask WRITE setFrontOutputMask NOTIFY frontOutputMaskChanged) Q_PROPERTY(uint backOutputMask READ backOutputMask WRITE setBackOutputMask NOTIFY backOutputMaskChanged) public: - explicit QStencilMask(Qt3DCore::QNode *parent = 0); + explicit QStencilMask(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStencilMask(); uint frontOutputMask() const; diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index ad644dd9a..bf465f7c2 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState Q_PROPERTY(Qt3DRender::QStencilTestArguments *back READ back CONSTANT) public: - explicit QStencilTest(Qt3DCore::QNode *parent = 0); + explicit QStencilTest(Qt3DCore::QNode *parent = Q_NULLPTR); ~QStencilTest(); QStencilTestArguments *front() const; diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index ab01d8d6e..31148b946 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -324,9 +324,10 @@ Q_SIGNALS: void layersChanged(int layers); protected: - explicit QAbstractTexture(Qt3DCore::QNode *parent = 0); - explicit QAbstractTexture(Target target, Qt3DCore::QNode *parent = 0); - QAbstractTexture(QAbstractTexturePrivate &dd, Qt3DCore::QNode *parent = 0); + explicit QAbstractTexture(Qt3DCore::QNode *parent = nullptr); + explicit QAbstractTexture(Target target, Qt3DCore::QNode *parent = nullptr); + QAbstractTexture(QAbstractTexturePrivate &dd, Qt3DCore::QNode *parent = nullptr); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void setStatus(Status status); diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index 80379fdaa..dd27c1513 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -74,7 +74,7 @@ class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) Q_PROPERTY(Qt3DRender::QAbstractTexture::CubeMapFace face READ face WRITE setFace NOTIFY faceChanged) public: - explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0); + explicit QAbstractTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR); virtual ~QAbstractTextureImage(); int mipLevel() const; @@ -95,7 +95,7 @@ protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void notifyDataGeneratorChanged(); virtual QTextureImageDataGeneratorPtr dataGenerator() const = 0; - QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = 0); + QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = nullptr); private: Q_DECLARE_PRIVATE(QAbstractTextureImage) diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index 7dfb517cc..c8257ae1e 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QTextureImage(Qt3DCore::QNode *parent = 0); + explicit QTextureImage(Qt3DCore::QNode *parent = Q_NULLPTR); ~QTextureImage(); QUrl source() const; diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index eb313fa4d..ee04a5690 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -65,8 +65,8 @@ public: }; Q_ENUM(WrapMode) - explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = 0); - explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = 0); + explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = Q_NULLPTR); + explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = Q_NULLPTR); WrapMode x() const; WrapMode y() const; diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index 81fef6eea..56ef71d7d 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -1916,6 +1916,14 @@ void GltfExporter::exportParameter(QJsonObject &dst, const QVector<ProgramInfo:: } } +namespace { +struct ProgramNames +{ + QString name; + QString coreName; +}; +} + void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) { if (!opts.shaders) @@ -1973,12 +1981,6 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) obj["shaders"] = shaders; QJsonObject programs; - struct ProgramNames - { - QString name; - QString coreName; - }; - QHash<ProgramInfo *, ProgramNames> programMap; foreach (ProgramInfo *prog, m_usedPrograms) { QJsonObject program; |
