diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:53:46 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:54:02 +0100 |
| commit | d162d3b03cf5fb5c359c87ac841dd74a9909a548 (patch) | |
| tree | 09cf4d7301db2d4eabb3b403c8755b1d29ca8297 /tests/shared/qt_quick_controls_quicktest.h | |
| parent | 1e985e46476398bf75118480edc4d15547764f7e (diff) | |
| parent | 8e8b0dbaec1868944e0a699a4474304b0cae65e9 (diff) | |
| download | qtquickcontrols-d162d3b03cf5fb5c359c87ac841dd74a9909a548.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I278a90bb0049a96008700f4e0128bd95c0fae1fd
Diffstat (limited to 'tests/shared/qt_quick_controls_quicktest.h')
| -rw-r--r-- | tests/shared/qt_quick_controls_quicktest.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/shared/qt_quick_controls_quicktest.h b/tests/shared/qt_quick_controls_quicktest.h index 67dffa92..cbbd5a25 100644 --- a/tests/shared/qt_quick_controls_quicktest.h +++ b/tests/shared/qt_quick_controls_quicktest.h @@ -34,14 +34,9 @@ #ifndef QT_QUICK_CONTROLS_QUICKTEST_H #define QT_QUICK_CONTROLS_QUICKTEST_H +#include "qt_quick_controls_testapp.h" #include <QtQuickTest/quicktestglobal.h> -#ifdef QT_WIDGETS_LIB -#include <QtWidgets/QApplication> -#else -#include <QtGui/QGuiApplication> -#endif - QT_BEGIN_NAMESPACE #ifdef QUICK_TEST_SOURCE_DIR @@ -50,18 +45,12 @@ QT_BEGIN_NAMESPACE #define QT_QUICK_CONTROLS_TEST_MAIN_VAR 0 #endif -#ifdef QT_WIDGETS_LIB -#define Application QApplication -#else -#define Application QGuiApplication -#endif - #define QT_QUICK_CONTROLS_TEST_MAIN(name) \ int main(int argc, char **argv) \ { \ - Application* app = 0; \ + QtQuickControlsTestApp* app = 0; \ if (!QCoreApplication::instance()) \ - app = new Application(argc, argv); \ + app = new QtQuickControlsTestApp(argc, argv); \ int i = quick_test_main(argc, argv, #name, QT_QUICK_CONTROLS_TEST_MAIN_VAR); \ delete app; \ return i; \ |