From 9c6a5d4757810f5993316015778fa63c22465287 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Tue, 4 Nov 2014 15:24:47 +0100
Subject: [PATCH] Share QtQuickControlsTestApp used by auto tests also for
manual tests
Change-Id: I5853c6c4c315aebdc378af1f3c0e6d34a2b19115
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
---
tests/shared/qt_quick_controls_quicktest.h | 17 ++-----
tests/shared/qt_quick_controls_testapp.h | 53 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 14 deletions(-)
create mode 100644 tests/shared/qt_quick_controls_testapp.h
diff --git a/tests/shared/qt_quick_controls_quicktest.h b/tests/shared/qt_quick_controls_quicktest.h
index 67dffa92a..cbbd5a258 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; \
diff --git a/tests/shared/qt_quick_controls_testapp.h b/tests/shared/qt_quick_controls_testapp.h
new file mode 100644
index 000000000..a57a4c5be
--- /dev/null
+++ b/tests/shared/qt_quick_controls_testapp.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT_QUICK_CONTROLS_TESTAPP_H
+#define QT_QUICK_CONTROLS_TESTAPP_H
+
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/QApplication>
+#else
+#include <QtGui/QGuiApplication>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+#ifdef QT_WIDGETS_LIB
+#define QtQuickControlsTestApp QApplication
+#else
+#define QtQuickControlsTestApp QGuiApplication
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QT_QUICK_CONTROLS_TESTAPP_H
--
GitLab