Merge branch 'jb41605' into 'master'

[statefs-qt] Update plugins.qmltypes. Contributes to JB#41605 See merge request mer-core/statefs-qt!6
sailfishos · Jun 28, 2018 · bae172b · bae172b
2 parents c91369d + 0e9a167
commit bae172b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/qml/contextkit-plugins.qmltypes b/src/qml/contextkit-plugins.qmltypes
@@ -1,12 +1,13 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable org.freedesktop.contextkit 1.0'
+// 'qmlplugindump -nonrelocatable org.freedesktop.contextkit 1.0'
 
 Module {
+    dependencies: []
     Component {
         name: "ContextPropertyDeclarative"
         defaultProperty: "value"

diff --git a/src/qml/plugins.qmltypes b/src/qml/plugins.qmltypes
@@ -1,12 +1,13 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable Mer.State 1.1'
+// 'qmlplugindump -nonrelocatable Mer.State 1.1'
 
 Module {
+    dependencies: []
     Component {
         name: "StateProperty"
         defaultProperty: "value"