diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-12-04 13:31:24 +0100 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@theqtcompany.com> | 2015-01-06 13:53:18 +0100 |
| commit | 70ddea603c70bb54bab47008680f743d05616bd4 (patch) | |
| tree | bd9d705971db14058eae24d1fa7c99ef8a14f697 /src/controls/Private/qquickcontrolsettings_p.h | |
| parent | 20abaf97f4995ca0ed89e7022456584aea095f54 (diff) | |
| download | qtquickcontrols-70ddea603c70bb54bab47008680f743d05616bd4.tar.gz | |
Clean up path vs url when handling the style import
Cleaned up path vs. url handling. styleImportPath now always returns a _path_,
previously it returned a url ("qrc:/foo") or a path ("/foo").
style now always returns an _url_.
Change-Id: I213ffdf8e88056f5706946c030aa4249e53fa709
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings_p.h')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h index 72a1ca6a..e64b665d 100644 --- a/src/controls/Private/qquickcontrolsettings_p.h +++ b/src/controls/Private/qquickcontrolsettings_p.h @@ -55,7 +55,7 @@ class QQuickControlSettings : public QObject public: QQuickControlSettings(QQmlEngine *engine); - QString style() const; + QUrl style() const; QString styleName() const; void setStyleName(const QString &name); |