diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 23:29:11 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-22 06:28:58 +0000 |
commit | 7e7d6d6c73920e1bc1df31b108280a7f165c74b1 (patch) | |
tree | 807e5ad7d2a00ef99b1ed26aa0aa5d7afb17be29 /tests | |
parent | 01cbb8231b0d6f589423b05f3c7ef7a3b3e209f2 (diff) |
Rename env vars (QT_LABS_CONTROLS_XXX -> QT_QUICK_CONTROLS_XXX)
Change-Id: Ie903d3491b03d4ec05dd28462a19ee464331d2a2
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/styles/tst_styles.cpp | 4 | ||||
-rw-r--r-- | tests/manual/testbench/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/styles/tst_styles.cpp b/tests/auto/styles/tst_styles.cpp index 8cdc1152..049e2bc9 100644 --- a/tests/auto/styles/tst_styles.cpp +++ b/tests/auto/styles/tst_styles.cpp @@ -42,7 +42,7 @@ static const char* styles[] = { "Material", "Universal" }; int main(int argc, char *argv[]) { - QByteArray style = qgetenv("QT_LABS_CONTROLS_STYLE"); + QByteArray style = qgetenv("QT_QUICK_CONTROLS_STYLE"); if (!style.isEmpty()) return quick_test_main(argc, argv, "tst_styles(" + style + ")", TST_CONTROLS_DATA); @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) for (int i = 0; i < count; ++i) { QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("QT_LABS_CONTROLS_STYLE", styles[i]); + env.insert("QT_QUICK_CONTROLS_STYLE", styles[i]); QProcess process; process.setProcessEnvironment(env); diff --git a/tests/manual/testbench/main.cpp b/tests/manual/testbench/main.cpp index e0f975fe..a782b5fe 100644 --- a/tests/manual/testbench/main.cpp +++ b/tests/manual/testbench/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) // These must be set before running. // TODO: move style selection into app UI and use settings to save choices. - // qputenv("QT_LABS_CONTROLS_STYLE", "material"); + // qputenv("QT_QUICK_CONTROLS_STYLE", "material"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); |