aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-07 12:56:19 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-12 06:57:14 +0000
commit42bb18482c76b5bb862b65c77db691248c4573d4 (patch)
tree4e984ad3b82a659204a449987a9487ad1210de2b /tests
parent1b06792a30b2914c59b1fb5816cb2f6abf601c63 (diff)
Cleanup old workarounds from tst_theme
Change-Id: I87767d7934ec0eecf7342b28a7a158f51393066b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/theme/tst_theme.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/tests/auto/theme/tst_theme.cpp b/tests/auto/theme/tst_theme.cpp
index daa1b1fe..786a9b53 100644
--- a/tests/auto/theme/tst_theme.cpp
+++ b/tests/auto/theme/tst_theme.cpp
@@ -35,23 +35,4 @@
****************************************************************************/
#include <QtQuickTest/quicktest.h>
-#include <QtGui/qguiapplication.h>
-#include <QtQml/qqmlapplicationengine.h>
-
-// based on QUICK_TEST_MAIN() defined in quicktest.h
-int main(int argc, char **argv)
-{
- QTEST_ADD_GPU_BLACKLIST_SUPPORT
- QTEST_SET_MAIN_SOURCE_PATH
-
- {
- // QTBUG-48651
- QGuiApplication app(argc, argv);
- QQmlApplicationEngine engine;
- engine.loadData("import Qt.labs.controls 1.0; Slider { } ");
- if (engine.rootObjects().isEmpty())
- return -1;
- }
-
- return quick_test_main(argc, argv, "tst_theme", QUICK_TEST_SOURCE_DIR);
-}
+QUICK_TEST_MAIN(tst_theme)