QQuickStyle: de-duplicate code

Unify reading of QML2_IMPORT_PATH and QT_QUICK_CONTROLS_STYLE_PATH.

Change-Id: Icb2a7b6156b5d32235adfe4abec5873256e6fcb5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index daa48144..5a295b6c 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -101,18 +101,22 @@ QT_BEGIN_NAMESPACE
     \sa {Styling Qt Quick Controls 2}
 */
 
-// TODO: QQmlImportDatabase::defaultImportPathList()
+static QStringList envPathList(const QByteArray &var)
+{
+    QStringList paths;
+    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) {
+        const QByteArray value = qgetenv(var);
+        paths += QString::fromLatin1(value).split(QDir::listSeparator(), QString::SkipEmptyParts);
+    }
+    return paths;
+}
+
 static QStringList defaultImportPathList()
 {
     QStringList importPaths;
     importPaths.reserve(3);
     importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-
-    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
-        const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-        importPaths += QString::fromLatin1(envImportPath).split(QDir::listSeparator(), QString::SkipEmptyParts);
-    }
-
+    importPaths += envPathList("QML2_IMPORT_PATH");
     importPaths += QStringLiteral("qrc:/qt-project.org/imports");
     importPaths += QCoreApplication::applicationDirPath();
     return importPaths;
@@ -263,11 +267,7 @@ Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec)
 QStringList QQuickStylePrivate::stylePaths()
 {
     // system/custom style paths
-    QStringList paths;
-    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE_PATH"))) {
-        const QByteArray value = qgetenv("QT_QUICK_CONTROLS_STYLE_PATH");
-        paths += QString::fromLatin1(value).split(QDir::listSeparator(), QString::SkipEmptyParts);
-    }
+    QStringList paths = envPathList("QT_QUICK_CONTROLS_STYLE_PATH");
 
     // built-in import paths
     const QString targetPath = QStringLiteral("QtQuick/Controls.2");