diff options
| author | Jeff Kehres <jkehres@rim.com> | 2012-03-23 10:43:44 -0400 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 19:36:55 +0200 |
| commit | 0723e14699704c35d5d61fa7f5e9f3bdbb378afa (patch) | |
| tree | c24951538714dd0e53c1b1785d64c34072191187 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | 77a816c00d80780f81dfcd723c0a287f2ddf660e (diff) | |
Integrate Blackberry Platform Services (BPS) with Qt event loop.
This ensures interoperability between the Blackbery C and C++ APIs
and makes it easier to expose platform services in C++ that are
exposed in BPS - since events from both APIs can be processed on
the same thread.
Change-Id: I7270adc64c26396f66d9126141500d5e58be51e7
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index d188ccbc9a..95c80cad20 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -67,10 +67,14 @@ #include <private/qlocale_p.h> #if defined(Q_OS_UNIX) -# if !defined(QT_NO_GLIB) -# include "qeventdispatcher_glib_p.h" +# if defined(Q_OS_BLACKBERRY) +# include "qeventdispatcher_blackberry_p.h" +# else +# if !defined(QT_NO_GLIB) +# include "qeventdispatcher_glib_p.h" +# endif +# include "qeventdispatcher_unix_p.h" # endif -# include "qeventdispatcher_unix_p.h" #endif #ifdef Q_OS_WIN @@ -328,12 +332,16 @@ void QCoreApplicationPrivate::createEventDispatcher() { Q_Q(QCoreApplication); #if defined(Q_OS_UNIX) +# if defined(Q_OS_BLACKBERRY) + eventDispatcher = new QEventDispatcherBlackberry(q); +# else # if !defined(QT_NO_GLIB) if (qgetenv("QT_NO_GLIB").isEmpty() && QEventDispatcherGlib::versionSupported()) eventDispatcher = new QEventDispatcherGlib(q); else # endif eventDispatcher = new QEventDispatcherUNIX(q); +# endif #elif defined(Q_OS_WIN) eventDispatcher = new QEventDispatcherWin32(q); #else |