diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 18:05:18 (GMT) |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2011-06-09 10:05:30 (GMT) |
| commit | e724cc03c9506e7c610df7d8ff462f994a7b114d (patch) | |
| tree | 1a1034d48f0b22e7305e2165eddc55014ce76040 | |
| parent | 7f093666e2e6c122750c428271b97dd39217f2b1 (diff) | |
| download | Qt-e724cc03c9506e7c610df7d8ff462f994a7b114d.zip Qt-e724cc03c9506e7c610df7d8ff462f994a7b114d.tar.gz Qt-e724cc03c9506e7c610df7d8ff462f994a7b114d.tar.bz2 | |
Fix wrong arguments order in a warning in QObject::moveToThread
Task-number: QTBUG-8478
(cherry picked from commit b7f48eee301e973fcfae08dfd8997538b6dbe251)
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 23a78ed..dc90080 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1476,7 +1476,7 @@ void QObject::moveToThread(QThread *targetThread) } else if (d->threadData != currentData) { qWarning("QObject::moveToThread: Current thread (%p) is not the object's thread (%p).\n" "Cannot move to target thread (%p)\n", - d->threadData->thread, currentData->thread, targetData->thread); + currentData->thread, d->threadData->thread, targetData->thread); #ifdef Q_WS_MAC qWarning("On Mac OS X, you might be loading two sets of Qt binaries into the same process. " |