diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /src/corelib/statemachine/qfinalstate.h | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'src/corelib/statemachine/qfinalstate.h')
| -rw-r--r-- | src/corelib/statemachine/qfinalstate.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 9b6b193231..1563bef397 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -42,9 +42,9 @@ #include <QtCore/qabstractstate.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(statemachine); -#ifndef QT_NO_STATEMACHINE +QT_BEGIN_NAMESPACE class QFinalStatePrivate; class Q_CORE_EXPORT QFinalState : public QAbstractState @@ -68,8 +68,6 @@ private: Q_DECLARE_PRIVATE(QFinalState) }; -#endif //QT_NO_STATEMACHINE - QT_END_NAMESPACE #endif |