diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 23:18:49 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-22 06:31:23 +0000 |
| commit | 3411c3579fb9e767c819c0c8d9f35c52c9964b06 (patch) | |
| tree | bb59e29289d4f4c88f92ccae9f0e9b63acb26aab /tests | |
| parent | 2ee6ef43d681746d07c1175738184715ce0d84e4 (diff) | |
| download | qtquickcontrols-3411c3579fb9e767c819c0c8d9f35c52c9964b06.tar.gz | |
Add support for QT_QUICK_CONTROLS_1_STYLE
Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system
wide style name preferences separately for Qt Quick Controls 1 and 2.
[ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE
environment variable, which takes priority over the existing variable
QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name
preferences separately for Qt Quick Controls 1 and 2.
Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp b/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp index 1df21391..ebd60d1e 100644 --- a/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp +++ b/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp @@ -69,7 +69,7 @@ void tst_customcontrolsstyle::style() QFETCH(QString, specifiedStyle); QFETCH(QString, expectedStyleName); - qputenv("QT_QUICK_CONTROLS_STYLE", specifiedStyle.toLocal8Bit()); + qputenv("QT_QUICK_CONTROLS_1_STYLE", specifiedStyle.toLocal8Bit()); const bool expectBase = expectedStyleName == QLatin1String("Base"); |