From 130830e2d3b8925350e519ddfc562483bb16588f Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 4 Jul 2012 21:13:01 +0200
Subject: statemachine: Add some missing QT_NO_PROPERTIES guards

... and move the applyProperties() declaration to the right place.

Change-Id: Iff4f468f2e7bc0350866b737a0db02c0f74bdd4f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
---
 src/corelib/statemachine/qstate_p.h        | 6 ++++++
 src/corelib/statemachine/qstatemachine_p.h | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index 5999aca140..8b15f05ada 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -62,6 +62,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_PROPERTIES
+
 struct QPropertyAssignment
 {
     QPropertyAssignment()
@@ -80,6 +82,8 @@ struct QPropertyAssignment
     bool explicitlySet;
 };
 
+#endif // QT_NO_PROPERTIES
+
 class QAbstractTransition;
 class QHistoryState;
 
@@ -109,7 +113,9 @@ public:
     mutable bool transitionsListNeedsRefresh;
     mutable QList<QAbstractTransition*> transitionsList;
 
+#ifndef QT_NO_PROPERTIES
     QList<QPropertyAssignment> propertyAssignments;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index b9716483a6..333ec062b3 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -142,10 +142,6 @@ public:
                           QSet<QAbstractState*> &statesToEnter,
                           QSet<QAbstractState*> &statesForDefaultEntry);
 
-    void applyProperties(const QList<QAbstractTransition*> &transitionList,
-                         const QList<QAbstractState*> &exitedStates,
-                         const QList<QAbstractState*> &enteredStates);
-
     static QState *toStandardState(QAbstractState *state);
     static const QState *toStandardState(const QAbstractState *state);
     static QFinalState *toFinalState(QAbstractState *state);
@@ -184,6 +180,10 @@ public:
     void cancelAllDelayedEvents();
     
 #ifndef QT_NO_PROPERTIES
+    void applyProperties(const QList<QAbstractTransition*> &transitionList,
+                         const QList<QAbstractState*> &exitedStates,
+                         const QList<QAbstractState*> &enteredStates);
+
     typedef QPair<QPointer<QObject>, QByteArray> RestorableId;
     QHash<RestorableId, QVariant> registeredRestorables;
     void registerRestorable(QObject *object, const QByteArray &propertyName);
-- 
cgit v1.2.3