diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmleasing/main.cpp | 4 | ||||
| -rw-r--r-- | tools/qmleasing/qmleasing.pro | 2 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 2 | ||||
| -rw-r--r-- | tools/qmltestrunner/main.cpp | 26 | ||||
| -rw-r--r-- | tools/tools.pro | 4 |
5 files changed, 7 insertions, 31 deletions
diff --git a/tools/qmleasing/main.cpp b/tools/qmleasing/main.cpp index 59daa0e664..a2b15108eb 100644 --- a/tools/qmleasing/main.cpp +++ b/tools/qmleasing/main.cpp @@ -41,7 +41,7 @@ #include <QPainter> #include <QtQuick/QQuickView> -#include <QApplication> +#include <QGuiApplication> #include <QEasingCurve> #include <QtQuick/QQuickPaintedItem> @@ -102,7 +102,7 @@ void EasingPlot::paint(QPainter *painter) int main(int argc, char ** argv) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); qmlRegisterType<EasingPlot>("EasingPlot", 1, 0, "EasingPlot"); diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro index 488ec5748a..b43071c4ed 100644 --- a/tools/qmleasing/qmleasing.pro +++ b/tools/qmleasing/qmleasing.pro @@ -1,4 +1,4 @@ -QT += qml quick widgets +QT += qml quick CONFIG -= app_bundle SOURCES += main.cpp diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 464f9b3758..1cf7b3c577 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -3,7 +3,7 @@ TARGET = qmlscene DESTDIR= $$QT.qml.bins QT += qml quick core-private -!isEmpty(QT.widgets.name): QT += widgets +!contains(QT_CONFIG, no-widgets):QT += widgets target.path = $$[QT_INSTALL_BINS] INSTALLS += target 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", "."); } diff --git a/tools/tools.pro b/tools/tools.pro index 186c7e9c3b..70aebf48f6 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += qmlscene qmlplugindump qmlmin qmleasing qmlprofiler easingcurveeditor - +SUBDIRS += qmlscene qmlplugindump qmlmin qmleasing qmlprofiler +!contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner |