From 7dbe1348cc7270a28026b012610f5a2bbe7ae429 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 15 Mar 2018 13:41:54 +0100
Subject: QQuickStyle: add API for managing style paths

In order to be able to use/refer to/select styles by name:

   - ./myapp -style Glossy
   - :/qtquickcontrols2.conf: [Controls] Style=Glossy
   - QT_QUICK_CONTROLS_STYLE=Glossy ./myapp

the style needs to be available in a place where QQC2 can find it
by the given name. Normally, QQC2 scans for available styles in the
QT_INSTALL_QML/QtQuick/Controls.2/ directory, where all the built-in
styles reside. However, 3rd party styles may want to install styles
into their own namespace, especially if they offer style-specific API.

If a style is installed elsewhere, QQC2 needs to be made aware of the
style path to make it possible to locate the style. Previously, the
QT_QUICK_CONTROLS_STYLE_PATH environment variable was the only way.
This adds proper C++ API, inspired by QQmlEngine's importPathList
and pluginPathList, to manage QQC2 style paths.

[ChangeLog][Controls][QQuickStyle] Added stylePathList() and
addStylePath() methods for managing the list of directories where
Qt Quick Controls 2 searches for available styles.

Task-number: QTBUG-67062
Change-Id: I1e85b5e09ba869483c0937ac61a0a2dcfc8e774e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quickcontrols2/qquickstyle.cpp | 60 ++++++++++++++++++++++++++++++++++++--
 src/quickcontrols2/qquickstyle.h   |  2 ++
 2 files changed, 60 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 139e65f1..967cf6f0 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -260,6 +260,7 @@ struct QQuickStyleSpec
     QString fallbackStyle;
     QByteArray fallbackMethod;
     QString configFilePath;
+    QStringList customStylePaths;
 };
 
 Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec)
@@ -269,7 +270,7 @@ QStringList QQuickStylePrivate::stylePaths(bool resolve)
     // user-requested style path
     QStringList paths;
     if (resolve) {
-        QString path = styleSpec->path();
+        QString path = styleSpec()->path();
         if (path.endsWith(QLatin1Char('/')))
             path.chop(1);
         if (!path.isEmpty())
@@ -277,6 +278,7 @@ QStringList QQuickStylePrivate::stylePaths(bool resolve)
     }
 
     // system/custom style paths
+    paths += styleSpec()->customStylePaths;
     paths += envPathList("QT_QUICK_CONTROLS_STYLE_PATH");
 
     // built-in import paths
@@ -430,9 +432,11 @@ void QQuickStyle::setFallbackStyle(const QString &style)
 
 /*!
     \since 5.9
-    Returns the names of the available built-in styles.
+    Returns the names of the available styles.
 
     \note The method must be called \b after creating an instance of QGuiApplication.
+
+    \sa stylePathList(), addStylePath()
 */
 QStringList QQuickStyle::availableStyles()
 {
@@ -456,4 +460,56 @@ QStringList QQuickStyle::availableStyles()
     return styles;
 }
 
+/*!
+    \since 5.12
+
+    Returns the list of directories where Qt Quick Controls 2 searches for available styles.
+
+    By default, the list contains paths specified in the \c QT_QUICK_CONTROLS_STYLE_PATH
+    environment variable, and any existing \c QtQuick/Controls.2 sub-directories in
+    \l QQmlEngine::importPathList().
+
+    \sa addStylePath(), availableStyles()
+*/
+QStringList QQuickStyle::stylePathList()
+{
+    return QQuickStylePrivate::stylePaths();
+}
+
+/*!
+    \since 5.12
+
+    Adds \a path as a directory where Qt Quick Controls 2 searches for available styles.
+
+    The \a path may be any local filesystem directory or \l {The Qt Resource System}{Qt Resource} directory.
+    For example, the following paths are all valid:
+
+    \list
+        \li \c {/path/to/styles/}
+        \li \c {file:///path/to/styles/}
+        \li \c {:/path/to/styles/}
+        \li \c {qrc:/path/to/styles/})
+    \endlist
+
+    The \a path will be converted into \l {QDir::canonicalPath}{canonical form} before it is added to
+    the style path list.
+
+    The newly added \a path will be first in the stylePathList().
+
+    \sa stylePathList(), availableStyles()
+*/
+void QQuickStyle::addStylePath(const QString &path)
+{
+    if (path.isEmpty())
+        return;
+
+    const QUrl url = QUrl(path);
+    if (url.isRelative() || url.scheme() == QLatin1String("file")
+            || (url.scheme().length() == 1 && QFile::exists(path)) ) {  // windows path
+        styleSpec()->customStylePaths.prepend(QDir(path).canonicalPath());
+    } else {
+        styleSpec()->customStylePaths.prepend(path);
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/src/quickcontrols2/qquickstyle.h b/src/quickcontrols2/qquickstyle.h
index ab79c3e0..ce55b76b 100644
--- a/src/quickcontrols2/qquickstyle.h
+++ b/src/quickcontrols2/qquickstyle.h
@@ -51,6 +51,8 @@ public:
     static void setStyle(const QString &style);
     static void setFallbackStyle(const QString &style);
     static QStringList availableStyles();
+    static QStringList stylePathList();
+    static void addStylePath(const QString &path);
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3