diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-06-25 09:31:35 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-06-28 16:15:47 +0000 |
| commit | a4d190554ae3d35b53cd7e7823a23f548bd24cfe (patch) | |
| tree | e044686c947e6f54618efe7855ba0427484aee3e /src/widgets | |
| parent | 61b47df3915abeec44b830fda211cb1105070500 (diff) | |
Convert features.undostack to QT_CONFIG
Change-Id: I7fc3aa44625fc97b802def4954f88c091c53f876
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/util/qundostack.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/util/qundostack.h | 4 | ||||
| -rw-r--r-- | src/widgets/util/qundostack_p.h | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp index 849b3c78f2..fd0035962e 100644 --- a/src/widgets/util/qundostack.cpp +++ b/src/widgets/util/qundostack.cpp @@ -344,7 +344,7 @@ const QUndoCommand *QUndoCommand::child(int index) const #endif // QT_NO_UNDOCOMMAND -#ifndef QT_NO_UNDOSTACK +#if QT_CONFIG(undostack) /*! \class QUndoStack @@ -1334,4 +1334,4 @@ QT_END_NAMESPACE #include "moc_qundostack.cpp" #include "moc_qundostack_p.cpp" -#endif // QT_NO_UNDOSTACK +#endif // QT_CONFIG(undostack) diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index 2a8f4decb6..e402e16eae 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -85,7 +85,7 @@ private: #endif // QT_NO_UNDOCOMMAND -#ifndef QT_NO_UNDOSTACK +#if QT_CONFIG(undostack) class Q_WIDGETS_EXPORT QUndoStack : public QObject { @@ -150,7 +150,7 @@ private: friend class QUndoGroup; }; -#endif // QT_NO_UNDOSTACK +#endif // QT_CONFIG(undostack) QT_END_NAMESPACE diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index e92a1fe620..04bc381114 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -74,7 +74,7 @@ public: bool obsolete; }; -#ifndef QT_NO_UNDOSTACK +#if QT_CONFIG(undostack) class QUndoStackPrivate : public QObjectPrivate { @@ -108,7 +108,6 @@ private: }; #endif // QT_NO_ACTION - QT_END_NAMESPACE -#endif // QT_NO_UNDOSTACK +#endif // QT_CONFIG(undostack) #endif // QUNDOSTACK_P_H |