diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-02 17:48:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-03 12:57:38 +0200 |
| commit | addc1461acfcc7e97986435d956e23e5bce08c36 (patch) | |
| tree | b899f9ffd36f1291ad00da25731eae323f1bface | |
| parent | c185d6cd67653b34f04a7999a84634de1f1063b0 (diff) | |
| download | qtquickcontrols-addc1461acfcc7e97986435d956e23e5bce08c36.tar.gz | |
Allow QT_QUICK_CONTROLS_STYLE pointing to resources
Change-Id: I4cf6e040c8ac5bc2e8ba1838f22cb5b1cd776f85
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index b7ebc213..2f86a4a1 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -90,7 +90,9 @@ static QString styleImportPath(QQmlEngine *engine, const QString &styleName) { QString path = qgetenv("QT_QUICK_CONTROLS_STYLE"); QFileInfo info(path); - if (info.isRelative()) { + if (fromResource(path)) { + path = info.path(); + } else if (info.isRelative()) { bool found = false; foreach (const QString &import, engine->importPathList()) { QDir dir(import + QLatin1String("/QtQuick/Controls/Styles")); |