diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-08-23 12:57:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-28 20:22:24 +0200 |
| commit | 1bcab3a7479220930291238eac2c67b412d2bf73 (patch) | |
| tree | 5298e5debfbb740d0d223ec30a349a0cbe118812 /src/qmltest | |
| parent | 75a6f86f685f1a5ce6cb91212641fe446a37be2e (diff) | |
qmltest: Add QTestDefinedVariables
QTestDefinedVariables is used by the QTestRootObject to check
is a preprocessor variable is defined.
Adding QT_OPENGL_ES_2_ANGLE. It can be useful to know
if it is defined (Win32 + Angle) while running a test.
Change-Id: I2f9ffb1028c94095c711ab64737b53b60c055312
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index fd0270fd06..c210c21288 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -49,6 +49,7 @@ #include <QtQuick/qquickview.h> #include <QtQml/qjsvalue.h> #include <QtQml/qjsengine.h> +#include <QtQml/qqmlpropertymap.h> #include <QtGui/qopengl.h> #include <QtCore/qurl.h> #include <QtCore/qfileinfo.h> @@ -75,9 +76,15 @@ class QTestRootObject : public QObject Q_OBJECT Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged) Q_PROPERTY(bool hasTestCase READ hasTestCase WRITE setHasTestCase NOTIFY hasTestCaseChanged) + Q_PROPERTY(QObject *defined READ defined) public: QTestRootObject(QObject *parent = 0) - : QObject(parent), hasQuit(false), m_windowShown(false), m_hasTestCase(false) {} + : QObject(parent), hasQuit(false), m_windowShown(false), m_hasTestCase(false) { + m_defined = new QQmlPropertyMap(this); +#if defined(QT_OPENGL_ES_2_ANGLE) + m_defined->insert(QLatin1String("QT_OPENGL_ES_2_ANGLE"), QVariant(true)); +#endif + } static QTestRootObject *instance() { static QPointer<QTestRootObject> object = new QTestRootObject; @@ -94,6 +101,7 @@ public: bool windowShown() const { return m_windowShown; } void setWindowShown(bool value) { m_windowShown = value; emit windowShownChanged(); } + QQmlPropertyMap *defined() const { return m_defined; } void init() { setWindowShown(false); setHasTestCase(false); hasQuit = false; } @@ -107,6 +115,7 @@ private Q_SLOTS: private: bool m_windowShown : 1; bool m_hasTestCase :1; + QQmlPropertyMap *m_defined; }; static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine) |