diff options
author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2015-10-15 16:24:54 +0300 |
---|---|---|
committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2015-11-21 15:38:39 +0000 |
commit | dbb7817e13bc7f7ccb8f04b00a65eb3dcf8d25f8 (patch) | |
tree | 6b786e700e14bfe100bebd753b7133830231dac4 /src/corelib/thread | |
parent | 496823b9a856d649c468d03b64241562807f3c16 (diff) |
Remove remaining support for Blackberry
The platform is no longer supported or actively maintained, and is
in the way for improvements to the Unix event dispatcher and QProcess
implementations.
Change-Id: I3935488ca12e2139ea5f46068d7665a453e20526
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index c340915d35..cc0476461f 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -37,15 +37,12 @@ #include <private/qcoreapplication_p.h> -#if defined(Q_OS_BLACKBERRY) -# include <private/qeventdispatcher_blackberry_p.h> -#else -# if !defined(QT_NO_GLIB) -# include "../kernel/qeventdispatcher_glib_p.h" -# endif -# include <private/qeventdispatcher_unix_p.h> +#if !defined(QT_NO_GLIB) +# include "../kernel/qeventdispatcher_glib_p.h" #endif +#include <private/qeventdispatcher_unix_p.h> + #include "qthreadstorage.h" #include "qthread_p.h" @@ -246,9 +243,6 @@ typedef void*(*QtThreadCallback)(void*); void QThreadPrivate::createEventDispatcher(QThreadData *data) { -#if defined(Q_OS_BLACKBERRY) - data->eventDispatcher.storeRelease(new QEventDispatcherBlackberry); -#else #if !defined(QT_NO_GLIB) if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB") @@ -257,7 +251,6 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data) else #endif data->eventDispatcher.storeRelease(new QEventDispatcherUNIX); -#endif data->eventDispatcher.load()->startingUp(); } |