aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-21 23:29:11 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-22 06:28:58 +0000
commit7e7d6d6c73920e1bc1df31b108280a7f165c74b1 (patch)
tree807e5ad7d2a00ef99b1ed26aa0aa5d7afb17be29 /src/imports/controls/material/qquickmaterialstyle.cpp
parent01cbb8231b0d6f589423b05f3c7ef7a3b3e209f2 (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 'src/imports/controls/material/qquickmaterialstyle.cpp')
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 9d38b079..55bc5066 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -1090,14 +1090,14 @@ void QQuickMaterialStyle::init()
QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Material"));
bool ok = false;
- QByteArray themeValue = resolveSetting("QT_LABS_CONTROLS_MATERIAL_THEME", settings, QStringLiteral("Theme"));
+ QByteArray themeValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_THEME", settings, QStringLiteral("Theme"));
Theme themeEnum = toEnumValue<Theme>(themeValue, &ok);
if (ok)
defaultTheme = m_theme = themeEnum;
else if (!themeValue.isEmpty())
qWarning().nospace().noquote() << "Material: unknown theme value: " << themeValue;
- QByteArray primaryValue = resolveSetting("QT_LABS_CONTROLS_MATERIAL_PRIMARY", settings, QStringLiteral("Primary"));
+ QByteArray primaryValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_PRIMARY", settings, QStringLiteral("Primary"));
Color primaryEnum = toEnumValue<Color>(primaryValue, &ok);
if (ok) {
defaultPrimaryCustom = m_customPrimary = false;
@@ -1112,7 +1112,7 @@ void QQuickMaterialStyle::init()
}
}
- QByteArray accentValue = resolveSetting("QT_LABS_CONTROLS_MATERIAL_ACCENT", settings, QStringLiteral("Accent"));
+ QByteArray accentValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_ACCENT", settings, QStringLiteral("Accent"));
Color accentEnum = toEnumValue<Color>(accentValue, &ok);
if (ok) {
defaultAccentCustom = m_customAccent = false;
@@ -1127,7 +1127,7 @@ void QQuickMaterialStyle::init()
}
}
- QByteArray foregroundValue = resolveSetting("QT_LABS_CONTROLS_MATERIAL_FOREGROUND", settings, QStringLiteral("Foreground"));
+ QByteArray foregroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_FOREGROUND", settings, QStringLiteral("Foreground"));
Color foregroundEnum = toEnumValue<Color>(foregroundValue, &ok);
if (ok) {
defaultForegroundCustom = m_customForeground = false;
@@ -1142,7 +1142,7 @@ void QQuickMaterialStyle::init()
}
}
- QByteArray backgroundValue = resolveSetting("QT_LABS_CONTROLS_MATERIAL_BACKGROUND", settings, QStringLiteral("Background"));
+ QByteArray backgroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_BACKGROUND", settings, QStringLiteral("Background"));
Color backgroundEnum = toEnumValue<Color>(backgroundValue, &ok);
if (ok) {
defaultBackgroundCustom = m_customBackground = false;