aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmltestrunner
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2012-04-17 05:23:21 +0000
committerQt by Nokia <qt-info@nokia.com>2012-04-18 21:39:59 +0200
commitfe0a7b716633dd35df8ecc987ad1031b60aafca4 (patch)
tree0baaeb764b53aaf65e1d1121ac2978bdc1e539a6 /tools/qmltestrunner
parent092aba4d3e752a61a795dd7923da3a622ac43ef0 (diff)
Enabled widget free compilation of QtQuick
There is no hard dependency of QtQuick on QWidget. This change makes the minor adjustments required to remove the build dependency altogether. This patch follows the path of least resistance bypassing any elements with a dependency on the legacy QWidget functionality. Change-Id: Ie3f47d3b4f60a1460dbb5d76a494a2c329469cc0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tools/qmltestrunner')
-rw-r--r--tools/qmltestrunner/main.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/tools/qmltestrunner/main.cpp b/tools/qmltestrunner/main.cpp
index 8c7ad4cb72..09cfc7fa1a 100644
--- a/tools/qmltestrunner/main.cpp
+++ b/tools/qmltestrunner/main.cpp
@@ -45,31 +45,7 @@
#include <QtOpenGL/qgl.h>
#endif
-#ifdef QT_OPENGL_LIB
-
-static QWidget *qmltestrunner_create_gl_viewport()
-{
- return new QGLWidget();
-}
-
-#endif
-
int main(int argc, char **argv)
{
-#ifdef QT_OPENGL_LIB
- bool isOpenGL = false;
- for (int index = 1; index < argc; ++index) {
- if (strcmp(argv[index], "-opengl") == 0) {
- isOpenGL = true;
- break;
- }
- }
- if (isOpenGL) {
- return quick_test_main(argc, argv, "qmltestrunner",
- qmltestrunner_create_gl_viewport, ".");
- } else
-#endif
- {
- return quick_test_main(argc, argv, "qmltestrunner", 0, ".");
- }
+ return quick_test_main(argc, argv, "qmltestrunner", ".");
}