diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:46 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:47 +0200 |
commit | 8ed2fcd366caf310e99db982f222bc6ec750c0a7 (patch) | |
tree | c51cae57da4a87d677145e44ba57765a1e5a3874 /tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | |
parent | 6918c0a15ba049d7e0de2302846dfadce4866861 (diff) | |
parent | c12b5e07274acde364be98cd0de620d3a44c97b7 (diff) |
Merge 5.5 into 5.5.1
Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
Diffstat (limited to 'tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index efecf31d66..60e358232e 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -41,12 +41,7 @@ #include <private/qeventloop_p.h> #include <private/qthread_p.h> -#ifdef QT_GUI_LIB -#include <QtGui/QGuiApplication> -typedef QGuiApplication TestApplication; -#else typedef QCoreApplication TestApplication; -#endif class EventSpy : public QObject { |