Changeset 846 for trunk/src/corelib/statemachine/qstatemachine.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/statemachine/qstatemachine.cpp (modified) (4 diffs)

trunk/src/corelib/statemachine/qstatemachine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -179 +179 @@
 QStateMachinePrivate::QStateMachinePrivate()
 {
-    QAbstractStatePrivate::isMachine = true;
+    isMachine = true;
 
     state = NotRunning;
@@ -2136 +2136 @@
 /*!
   \reimp
+
 */
 void QStateMachine::onEntry(QEvent *event)
@@ -2145 +2146 @@
 /*!
   \reimp
+
+
 */
 void QStateMachine::onExit(QEvent *event)