diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 18:05:18 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 18:05:18 (GMT) |
| commit | b7f48eee301e973fcfae08dfd8997538b6dbe251 (patch) | |
| tree | 88cfaadef8724cfa9519480c501c693496523525 | |
| parent | dfbabeca0cb8a9efdb6758c228700eeb5996652c (diff) | |
| download | Qt-b7f48eee301e973fcfae08dfd8997538b6dbe251.zip Qt-b7f48eee301e973fcfae08dfd8997538b6dbe251.tar.gz Qt-b7f48eee301e973fcfae08dfd8997538b6dbe251.tar.bz2 | |
Fix wrong arguments order in a warning in QObject::moveToThread
Task-number: QTBUG-8478
| -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 68f34ca..53c5b3b 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1479,7 +1479,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. " |