diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-02 16:52:48 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-03 11:47:52 +0100 |
| commit | 1fa9c59f7eda5f8435ecb961a55c9a60cd4f7c67 (patch) | |
| tree | faa51936428e11bb63f1bf54b7bd7d1edc3b9640 /src | |
| parent | 6cf0a6af0fcd4e0c1a851e656959b2fefa4c6aa5 (diff) | |
Silence deprecation warnings and fix Qt for Python and documentation builds
Merely addding
DEFINES -= BUILD_QT3D_MODULE
to an example results in a deprecation warnings flood despite
the example not using any deprecrated API since for example
the flag operators and usages in the headers cause warnings by itself.
Remove the deprecation from smart pointer typedefs (it should
be sufficient to deprecate the pointee class) and disable warnings
for usages of deprecated enumerations.
This change silences the build of the simple-cpp example with
BUILD_QT3D_MODULE removed, more changes might be required to fix
the report.
Task-number: QTBUG-81058
Change-Id: Ie70c14cfef024a25b6b1330fe013ce57c69dc962
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/changes/qnodecommand.h | 2 | ||||
| -rw-r--r-- | src/core/changes/qnodecreatedchange.h | 2 | ||||
| -rw-r--r-- | src/core/changes/qscenechange.h | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/core/changes/qnodecommand.h b/src/core/changes/qnodecommand.h index 83d7caf4f..a31af1d6d 100644 --- a/src/core/changes/qnodecommand.h +++ b/src/core/changes/qnodecommand.h @@ -76,7 +76,7 @@ private: Q_DECLARE_PRIVATE(QNodeCommand) }; -Q3D_DECL_DEPRECATED typedef QSharedPointer<QNodeCommand> QNodeCommandPtr; +typedef QSharedPointer<QNodeCommand> QNodeCommandPtr; } // namespace Qt3DCore diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h index 8fc444b9c..326a83e99 100644 --- a/src/core/changes/qnodecreatedchange.h +++ b/src/core/changes/qnodecreatedchange.h @@ -65,7 +65,7 @@ private: Q_DECLARE_PRIVATE(QNodeCreatedChangeBase) }; -Q3D_DECL_DEPRECATED typedef QSharedPointer<QNodeCreatedChangeBase> QNodeCreatedChangeBasePtr; +typedef QSharedPointer<QNodeCreatedChangeBase> QNodeCreatedChangeBasePtr; template<typename T> class QNodeCreatedChange : public QNodeCreatedChangeBase diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index 792c00d0a..3fc896aca 100644 --- a/src/core/changes/qscenechange.h +++ b/src/core/changes/qscenechange.h @@ -60,8 +60,12 @@ enum Q3D_DECL_DEPRECATED ChangeFlag { CallbackTriggered = 1 << 8, AllChanges = 0xFFFFFFFF }; + +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) Q_DECLARE_OPERATORS_FOR_FLAGS(ChangeFlags) +QT_WARNING_POP class QNode; class QSceneChangePrivate; @@ -78,7 +82,10 @@ public: virtual ~QSceneChange(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED ChangeFlag type() const Q_DECL_NOTHROW; + QT_WARNING_POP void setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOTHROW; DeliveryFlags deliveryFlags() const Q_DECL_NOTHROW; @@ -87,9 +94,12 @@ public: protected: Q_DECLARE_PRIVATE(QSceneChange) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED Q3D_DECL_DEPRECATED explicit QSceneChange(ChangeFlag type, QNodeId subjectId); Q3D_DECL_DEPRECATED explicit QSceneChange(QSceneChangePrivate &dd, ChangeFlag type, QNodeId subjectId); + QT_WARNING_POP QSceneChangePrivate *d_ptr; private: @@ -98,7 +108,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QSceneChange::DeliveryFlags) -Q3D_DECL_DEPRECATED typedef QSharedPointer<QSceneChange> QSceneChangePtr; +typedef QSharedPointer<QSceneChange> QSceneChangePtr; } // namespace Qt3DCore |