diff options
| author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 21:21:40 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:50:21 +0100 |
| commit | d3fdc132fe67806fe4a5ab73c43effa281c6d8a2 (patch) | |
| tree | 611578b8cf49dd00f69e68ab7e4d445c1080b479 /src/corelib/kernel/qcoreapplication_p.h | |
| parent | 0c29259fd7c6f6283d17b598ec61347fc214b869 (diff) | |
Remove Symbian specific code from QtCore.
Change-Id: I131303e28a12dccb96de3de4ca0073b389a9bbae
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 48a1ac6bc9..b5b6c0d5f2 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -58,20 +58,10 @@ #include "QtCore/qsettings.h" #include "private/qobject_p.h" -#ifdef Q_OS_SYMBIAN -#include <f32file.h> -#endif - QT_BEGIN_NAMESPACE typedef QList<QTranslator*> QTranslatorList; -#if defined(Q_OS_SYMBIAN) -# if !defined(QT_NO_SYSTEMLOCALE) -class QEnvironmentChangeNotifier; -# endif -class CApaCommandLine; -#endif class QAbstractEventDispatcher; class Q_CORE_EXPORT QCoreApplicationPrivate : public QObjectPrivate @@ -104,7 +94,7 @@ public: static bool checkInstance(const char *method); static void sendPostedEvents(QObject *receiver, int event_type, QThreadData *data); -#if !defined (QT_NO_DEBUG) || defined (QT_MAC_FRAMEWORK_BUILD) || defined (Q_OS_SYMBIAN) +#if !defined (QT_NO_DEBUG) || defined (QT_MAC_FRAMEWORK_BUILD) void checkReceiverThread(QObject *receiver); #endif int &argc; @@ -124,13 +114,6 @@ public: bool threadData_clean; QString cachedApplicationDirPath; QString cachedApplicationFilePath; -#if defined(Q_OS_SYMBIAN) -# if !defined(QT_NO_SYSTEMLOCALE) - QScopedPointer<QEnvironmentChangeNotifier> environmentChangeNotifier; - void symbianInit(); -# endif - static CApaCommandLine* symbianCommandLine(); -#endif static bool isTranslatorInstalled(QTranslator *translator); |