AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qnx: Check if QCoreApplication::instance() exists before using QSocketNotifier

Browse Source 
Change-Id: I9f00314ea1ef73b87bc56ca1f8fcf859c9cd1824
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
This commit is contained in:
mfekari 2012-11-28 04:55:54 -05:00 committed by The Qt Project
parent bf9691d9b7
commit 5e59215ac6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/tools/qlocale_unix.cpp
View File

@ -49,6 +49,7 @@
#if defined(Q_OS_BLACKBERRY)
#include <QtCore/private/qcore_unix_p.h>
#include <QCoreApplication>
#include <unistd.h>
#include <errno.h>
@ -114,10 +115,12 @@ void QQNXLocaleData::readPPSLocale()
return;
}
ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this);
updateMeasurementSystem();
if (QCoreApplication::instance()) {
ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this);
QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMeasurementSystem()));
}
}
#endif
#ifndef QT_NO_SYSTEMLOCALE