diff options
| author | Jeremy Katz <jeremy@panix.com> | 2016-06-22 12:12:06 -0700 |
|---|---|---|
| committer | Jeremy Katz <jeremy@panix.com> | 2016-07-20 09:49:51 +0000 |
| commit | a717da9bb7e7e5e1b84008ba59559ce6d8d5dbcc (patch) | |
| tree | ad7739aee13901e37f00b1680ed252c6b544282c /src | |
| parent | bc7d95510fd509535b2bfa3c715937b3c3d56507 (diff) | |
Enable loading styles from multiple import paths
Import was previously allowed from two locations:
* qrc:/QtQuick/VirtualKeyboard/content/styles/
* The first import path containing
QtQuick/VirtualKeyboard/Styles/
This prevents an application-supplied style outside of
these locations from being used, even if the style name is unique.
[ChangeLog] Added support for styles in any Qml import path
under the directory QtQuick/VirtualKeyboard/Styles/<style>
Change-Id: Ie6034709182f182efacb0317e49d095d51ced5a6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/doc/src/technical-guide.qdoc | 4 | ||||
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboardsettings.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 57042810..17bb5ad2 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -15,7 +15,7 @@ exampledirs += ../../../examples/virtualkeyboard \ examplesinstallpath = virtualkeyboard imagedirs += images -depends += qtcore qtgui qtquick +depends += qtcore qtgui qtqml qtquick qhp.projects = QtVirtualKeyboard diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 26e95227..7e279bcd 100644 --- a/src/virtualkeyboard/doc/src/technical-guide.qdoc +++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc @@ -577,7 +577,9 @@ style name, the virtual keyboard falls back in the default built-in style. \section2 Adding Custom Styles The process of creating a new style begins by creating a new subdirectory -for the style in the virtual keyboard \e Styles directory. The directory +for the style in a QML import path under the URL-based directory structure +QtQuick/VirtualKeyboard/Styles/. See \l {QML Import Path} +for information about QML import paths. The directory name can not contain spaces or special characters other than underscore. Also, the directory name can not be the same as one of the built-in style, which currently includes "default" and "retro". diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp index 1bc87583..479c8d43 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings.cpp +++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp @@ -71,10 +71,7 @@ public: for (int i = importPathList.size() - 1; i >= 0; --i) { const QString stylesPath = importPathList.at(i) + QStringLiteral("/QtQuick/VirtualKeyboard/Styles/"); - if (QFileInfo(stylesPath).isDir()) { - styleImportPathList += stylesPath; - break; - } + styleImportPathList += stylesPath; } for (const QString &styleImportPath : qAsConst(styleImportPathList)) { |