diff options
Diffstat (limited to 'recipes-connectivity/libconnman-qt')
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch | 25 | ||||
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | 4 |
2 files changed, 15 insertions, 14 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 index 75943db0..7a67c744 100644 --- 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 @@ -1,22 +1,23 @@ -From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001 +From 827b323ee9a6db04c1f5b644abea0ced2095096a 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> +Signed-off-by: Herman van Hazendonk <github.com@herrie.org> --- - plugin/components.h | 2 +- - plugin/plugin.pro | 2 +- - plugin/qmldir | 2 +- + plugin/plugin.cpp | 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 +diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp +index a383482..451c95f 100644 +--- a/plugin/plugin.cpp ++++ b/plugin/plugin.cpp +@@ -24,7 +24,7 @@ + class ConnmanPlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "MeeGo.Connman") @@ -25,7 +26,7 @@ index d4f2bcd..49b7ac2 100644 public: void registerTypes(const char *uri); diff --git a/plugin/plugin.pro b/plugin/plugin.pro -index 31d9076..da47ad9 100644 +index c4f54cf..3763f57 100644 --- a/plugin/plugin.pro +++ b/plugin/plugin.pro @@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) @@ -46,5 +47,5 @@ index 5db82b7..de56688 100644 +module Connman plugin ConnmanQtDeclarative -- -1.8.1.2 +2.11.0.windows.3 diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index 9605777d..ecd295c3 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb @@ -5,9 +5,9 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" DEPENDS += "qtbase qtdeclarative" -PV = "1.1.10+git${SRCPV}" +PV = "1.2.4+git${SRCPV}" -SRCREV = "4d6def3053eaccaac04e4f9e03ee24dea8b9e8d8" +SRCREV = "9d98e12ed60ae4fa9da62485cb8a82129ed1a464" 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 \ " |