diff options
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 31c749dc13..fb4c5cceb9 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1394,7 +1394,7 @@ bool QObject::eventFilter(QObject * /* watched */, QEvent * /* event */) \sa signalsBlocked() */ -bool QObject::blockSignals(bool block) +bool QObject::blockSignals(bool block) Q_DECL_NOTHROW { Q_D(QObject); bool previous = d->blockSig; @@ -1475,7 +1475,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 |