diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-02 16:06:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-02 16:06:13 (GMT) |
| commit | c5ac774717f1ec2c99407e3ee3c337127d94329e (patch) | |
| tree | d316abfff7585c3ff9b8c08ecf9ef8b6bd0d73b0 /src/corelib | |
| parent | 187185bf246b63f080cf2a59b6768756b399e72c (diff) | |
| parent | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff) | |
| download | Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.zip Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.gz Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmimedata.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index bf4001a..899ca7b 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -249,7 +249,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty \o We can subclass QMimeData and reimplement hasFormat(), formats(), and retrieveData(). - \o If the drag and drop operation occurs withing a single + \o If the drag and drop operation occurs within a single application, we can subclass QMimeData and add extra data in it, and use a qobject_cast() in the receiver's drop event handler. For example: diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 09558a9..98f7931 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -178,7 +178,7 @@ QT_BEGIN_NAMESPACE QStateMachinePrivate::QStateMachinePrivate() { - QAbstractStatePrivate::isMachine = true; + isMachine = true; state = NotRunning; _startState = 0; |