diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
| commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
| tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/corelib/kernel/qobject.cpp | |
| parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
| parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -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 40279cf2b34..774e46ea330 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1476,7 +1476,7 @@ void QObject::moveToThread(QThread *targetThread) currentData->thread, d->threadData->thread, targetData ? targetData->thread : Q_NULLPTR); #ifdef Q_OS_MAC - qWarning("On Mac OS X, you might be loading two sets of Qt binaries into the same process. " + qWarning("You might be loading two sets of Qt binaries into the same process. " "Check that all plugins are compiled against the right Qt binaries. Export " "DYLD_PRINT_LIBRARIES=1 and check that only one set of binaries are being loaded."); #endif |