1 files changed, 28 insertions, 1 deletions
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp
index b4da3045..15edc67b 100644
--- a/tests/auto/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp
@@ -38,15 +38,28 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuickControls2/qquickstyle.h>
+#include <QtQuickControls2/private/qquickstyle_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 
 class tst_QQuickStyle : public QObject
 {
     Q_OBJECT
 
 private slots:
+    void init();
     void lookup();
+    void commandLineArgument();
+    void environmentVariables();
 };
 
+void tst_QQuickStyle::init()
+{
+    QQuickStylePrivate::reset();
+    QGuiApplicationPrivate::styleOverride.clear();
+    qunsetenv("QT_QUICK_CONTROLS_STYLE");
+    qunsetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE");
+}
+
 void tst_QQuickStyle::lookup()
 {
     QVERIFY(QQuickStyle::name().isEmpty());
@@ -58,7 +71,7 @@ void tst_QQuickStyle::lookup()
 
     QQmlEngine engine;
     QQmlComponent component(&engine);
-    component.setData("import QtQuick 2.0; import QtQuick.Controls 2.0; Control { }", QUrl());
+    component.setData("import QtQuick 2.0; import QtQuick.Controls 2.1; Control { }", QUrl());
 
     QScopedPointer<QObject> object(component.create());
     QVERIFY(!object.isNull());
@@ -67,6 +80,20 @@ void tst_QQuickStyle::lookup()
     QVERIFY(!QQuickStyle::path().isEmpty());
 }
 
+void tst_QQuickStyle::commandLineArgument()
+{
+    QGuiApplicationPrivate::styleOverride = "CmdLineArgStyle";
+    QCOMPARE(QQuickStyle::name(), QString("CmdLineArgStyle"));
+}
+
+void tst_QQuickStyle::environmentVariables()
+{
+    qputenv("QT_QUICK_CONTROLS_STYLE", "EnvVarStyle");
+    qputenv("QT_QUICK_CONTROLS_FALLBACK_STYLE", "EnvVarFallbackStyle");
+    QCOMPARE(QQuickStyle::name(), QString("EnvVarStyle"));
+    QCOMPARE(QQuickStylePrivate::fallbackStyle(), QString("EnvVarFallbackStyle"));
+}
+
 QTEST_MAIN(tst_QQuickStyle)
 
 #include "tst_qquickstyle.moc"