diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:26 +0100 |
| commit | 2e48d16e4a230069884ac0585ae111037f4171fb (patch) | |
| tree | d31d2dbc2be10d203721387955f2cdde451e5b95 /src/extras | |
| parent | 4cfdab4a3317b09dab9c4000b6a004d2ea0560c1 (diff) | |
| parent | d3dbbe4781c4a7137ada0324e6ec5b14fed5c859 (diff) | |
| download | qtquickcontrols-2e48d16e4a230069884ac0585ae111037f4171fb.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7177ee6f1dc74d7f0d2ac9a3aedcc8d7a00cee41
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/Styles/Flat/flatstyleplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp index db464c38..a207f0a0 100644 --- a/src/extras/Styles/Flat/flatstyleplugin.cpp +++ b/src/extras/Styles/Flat/flatstyleplugin.cpp @@ -69,7 +69,7 @@ QtQuickExtrasStylesPlugin::QtQuickExtrasStylesPlugin(QObject *parent) : void QtQuickExtrasStylesPlugin::registerTypes(const char *uri) { - Q_INIT_RESOURCE(flatstyle); + initResources(); const QString prefix = "qrc:/ExtrasImports/QtQuick/Controls/Styles/Flat/"; // register version 1.0 |