Merge branch 'jb41605' into 'master'

Add plugins.qmltypes

See merge request mer-core/libcontentaction!4

declarative/declarative.pro

@@ -26,9 +26,12 @@ HEADERS += \
     PRE_TARGETDEPS += $$copy_qmldir.target
 }
 
-qmldir.files = qmldir
+qmldir.files = qmldir plugins.qmltypes
 
 qmldir.path = $$installPath
 target.path = $$installPath
 
 INSTALLS += target qmldir
+
+qmltypes.commands = qmlplugindump -nonrelocatable org.nemomobile.contentaction 1.0 > $$PWD/plugins.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes

declarative/plugins.qmltypes

@@ -0,0 +1,35 @@
+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 -nonrelocatable org.nemomobile.contentaction 1.0'
+
+Module {
+    dependencies: []
+    Component {
+        name: "DeclarativeContentAction"
+        prototype: "QObject"
+        exports: ["org.nemomobile.contentaction/ContentAction 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Error"
+            values: {
+                "NoError": 0,
+                "FileTypeNotSupported": 1,
+                "FileDoesNotExist": 2,
+                "UrlSchemeNotSupported": 3,
+                "InvalidUrl": 4
+            }
+        }
+        Property { name: "error"; type: "Error"; isReadonly: true }
+        Method {
+            name: "trigger"
+            type: "bool"
+            Parameter { name: "url"; type: "QUrl" }
+        }
+    }
+}

declarative/qmldir

@@ -1,2 +1,3 @@
 module org.nemomobile.contentaction
 plugin contentaction
+typeinfo plugins.qmltypes

rpm/libcontentaction-qt5.spec

@@ -4,7 +4,7 @@ Version:    0.2.9
 Release:    1
 Group:      System/Desktop
 License:    LGPLv2.1
-URL:        https://github.com/nemomobile/libcontentaction
+URL:        https://git.merproject.org/mer-core/libcontentaction
 Source0:    %{name}-%{version}.tar.bz2
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig