diff options
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/dependencies.json | 1 | ||||
| -rw-r--r-- | src/qmltest/quicktest.cpp | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult_p.h | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/qmltest/dependencies.json b/src/qmltest/dependencies.json deleted file mode 100644 index b2c4125178..0000000000 --- a/src/qmltest/dependencies.json +++ /dev/null @@ -1 +0,0 @@ -["QtQuick 2.0", "QtQuick.Window 2.0"] diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 470b3c0f7a..96a5c20f22 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -52,7 +52,7 @@ #include <QtQml/qqmlpropertymap.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/qquickitem.h> -#include <QtGui/qopengl.h> +#include <qopengl.h> #include <QtCore/qurl.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 81b9d78830..7ebfb21186 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -158,10 +158,10 @@ public Q_SLOTS: QObject *grabImage(QQuickItem *item); - Q_REVISION(1) QObject *findChild(QObject *parent, const QString &objectName); + Q_REVISION(1, 1) QObject *findChild(QObject *parent, const QString &objectName); - Q_REVISION(13) bool isPolishScheduled(QQuickItem *item) const; - Q_REVISION(13) bool waitForItemPolished(QQuickItem *item, int timeout); + Q_REVISION(1, 13) bool isPolishScheduled(QQuickItem *item) const; + Q_REVISION(1, 13) bool waitForItemPolished(QQuickItem *item, int timeout); public: // Helper functions for the C++ main() shell. |