diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-10 13:59:44 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-05 13:43:11 +0200 |
| commit | 20e3c35f9ce30dcd25fac773d2b63f43ac8668a1 (patch) | |
| tree | 4733153be71046c38a9a990c3231a5edbc0a8222 | |
| parent | 37a165badb89c4908cfbb535c784586481949a26 (diff) | |
libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch | 50 | ||||
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb (renamed from recipes-qt/libconnman-qt/libconnman-qt5_git.bb) | 4 |
2 files changed, 53 insertions, 1 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch new file mode 100644 index 00000000..75943db0 --- /dev/null +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch @@ -0,0 +1,50 @@ +From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001 +From: Christophe Chapuis <chris.chapuis@gmail.com> +Date: Tue, 26 Jan 2016 18:56:42 +0100 +Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common + component + +Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> +--- + plugin/components.h | 2 +- + plugin/plugin.pro | 2 +- + plugin/qmldir | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugin/components.h b/plugin/components.h +index d4f2bcd..49b7ac2 100644 +--- a/plugin/components.h ++++ b/plugin/components.h +@@ -17,7 +17,7 @@ + class Components : public QQmlExtensionPlugin + { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "MeeGo.Connman") ++ Q_PLUGIN_METADATA(IID "Connman") + + public: + void registerTypes(const char *uri); +diff --git a/plugin/plugin.pro b/plugin/plugin.pro +index 31d9076..da47ad9 100644 +--- a/plugin/plugin.pro ++++ b/plugin/plugin.pro +@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) + QT += qml + OTHER_FILES += plugin.json qmldirs + +-MODULENAME = MeeGo/Connman ++MODULENAME = Connman + TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME + + target.path = $$TARGETPATH +diff --git a/plugin/qmldir b/plugin/qmldir +index 5db82b7..de56688 100644 +--- a/plugin/qmldir ++++ b/plugin/qmldir +@@ -1,2 +1,2 @@ +-module MeeGo.Connman ++module Connman + plugin ConnmanQtDeclarative +-- +1.8.1.2 + diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index fe86eb56..3ceb3558 100644 --- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -8,7 +8,9 @@ DEPENDS += "qtbase qtdeclarative" PV = "1.0.98+git${SRCPV}" SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92" -SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https" +SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ + file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ +" S = "${WORKDIR}/git" |