From b8a4216f2fb5bc6e5fd5b54c661344e60fc9093c Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Tue, 5 May 2009 18:30:47 +0200
Subject: get rid of warnings

---
 src/corelib/statemachine/qhistorystate.cpp | 2 ++
 src/corelib/statemachine/qstatemachine.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp
index fd6f53d..b6ec471 100644
--- a/src/corelib/statemachine/qhistorystate.cpp
+++ b/src/corelib/statemachine/qhistorystate.cpp
@@ -202,6 +202,7 @@ void QHistoryState::setHistoryType(HistoryType type)
 */
 void QHistoryState::onEntry(QEvent *event)
 {
+    Q_UNUSED(event);
 }
 
 /*!
@@ -209,6 +210,7 @@ void QHistoryState::onEntry(QEvent *event)
 */
 void QHistoryState::onExit(QEvent *event)
 {
+    Q_UNUSED(event);
 }
 
 /*!
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 8b0b4f3..232d801 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -661,7 +661,7 @@ void QStateMachinePrivate::applyProperties(const QList<QAbstractTransition*> &tr
         // before the state that assigned them is exited. If state does not explicitly 
         // assign a property which is assigned by the parent, it inherits the parent's assignment.
         QState *parentState = s;
-        while (parentState = parentState->parentState()) {
+        while ((parentState = parentState->parentState()) != 0) {
             assignments = QStatePrivate::get(parentState)->propertyAssignments;
             for (int j=0; j<assignments.size(); ++j) {
                 const QPropertyAssignment &assn = assignments.at(j);
-- 
cgit v0.12