diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/corelib/kernel/qcoreapplication.h | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index c3d174d878..04d538d1b3 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -46,10 +46,6 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qeventloop.h> -#ifdef QT_INCLUDE_COMPAT -#include <QtCore/qstringlist.h> -#endif - #if defined(Q_OS_WIN) && !defined(tagMSG) typedef struct tagMSG MSG; #endif @@ -79,9 +75,6 @@ class Q_CORE_EXPORT QCoreApplication : public QObject Q_DECLARE_PRIVATE(QCoreApplication) public: enum { ApplicationFlags = QT_VERSION -#if !defined(QT3_SUPPORT) - | 0x01000000 -#endif }; QCoreApplication(int &argc, char **argv, int = ApplicationFlags); @@ -155,19 +148,6 @@ public: static void flush(); -#if defined(QT3_SUPPORT) - inline QT3_SUPPORT void lock() {} - inline QT3_SUPPORT void unlock(bool = true) {} - inline QT3_SUPPORT bool locked() { return false; } - inline QT3_SUPPORT bool tryLock() { return false; } - - static inline QT3_SUPPORT void processOneEvent() - { processEvents(QEventLoop::WaitForMoreEvents); } - static QT3_SUPPORT int enter_loop(); - static QT3_SUPPORT void exit_loop(); - static QT3_SUPPORT int loopLevel(); -#endif - #if defined(Q_OS_WIN) virtual bool winEventFilter(MSG *message, long *result); #endif |