summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity
diff options
context:
space:
mode:
authorHerman van Hazendonk <github.com@herrie.org>2017-10-12 14:13:05 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-10-17 11:12:17 +0000
commitbbb304456978fa9713932e9ff529d18a5ef2a947 (patch)
treea21e348610661e2c4b21bdf31ad078a4a92aa8df /recipes-connectivity
parent2c3ef00f53683fbdce5b390950b49b67da85d3a1 (diff)
downloadmeta-qt5-bbb304456978fa9713932e9ff529d18a5ef2a947.tar.gz
meta-qt5: Update to 5.9.2 release
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
Diffstat (limited to 'recipes-connectivity')
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch25
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb4
-rw-r--r--recipes-connectivity/libqofono/libqofono_git.bb4
3 files changed, 17 insertions, 16 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 @@
1From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001 1From 827b323ee9a6db04c1f5b644abea0ced2095096a Mon Sep 17 00:00:00 2001
2From: Christophe Chapuis <chris.chapuis@gmail.com> 2From: Christophe Chapuis <chris.chapuis@gmail.com>
3Date: Tue, 26 Jan 2016 18:56:42 +0100 3Date: Tue, 26 Jan 2016 18:56:42 +0100
4Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common 4Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common
5 component 5 component
6 6
7Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> 7Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
8Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
8--- 9---
9 plugin/components.h | 2 +- 10 plugin/plugin.cpp | 2 +-
10 plugin/plugin.pro | 2 +- 11 plugin/plugin.pro | 2 +-
11 plugin/qmldir | 2 +- 12 plugin/qmldir | 2 +-
12 3 files changed, 3 insertions(+), 3 deletions(-) 13 3 files changed, 3 insertions(+), 3 deletions(-)
13 14
14diff --git a/plugin/components.h b/plugin/components.h 15diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
15index d4f2bcd..49b7ac2 100644 16index a383482..451c95f 100644
16--- a/plugin/components.h 17--- a/plugin/plugin.cpp
17+++ b/plugin/components.h 18+++ b/plugin/plugin.cpp
18@@ -17,7 +17,7 @@ 19@@ -24,7 +24,7 @@
19 class Components : public QQmlExtensionPlugin 20 class ConnmanPlugin: public QQmlExtensionPlugin
20 { 21 {
21 Q_OBJECT 22 Q_OBJECT
22- Q_PLUGIN_METADATA(IID "MeeGo.Connman") 23- Q_PLUGIN_METADATA(IID "MeeGo.Connman")
@@ -25,7 +26,7 @@ index d4f2bcd..49b7ac2 100644
25 public: 26 public:
26 void registerTypes(const char *uri); 27 void registerTypes(const char *uri);
27diff --git a/plugin/plugin.pro b/plugin/plugin.pro 28diff --git a/plugin/plugin.pro b/plugin/plugin.pro
28index 31d9076..da47ad9 100644 29index c4f54cf..3763f57 100644
29--- a/plugin/plugin.pro 30--- a/plugin/plugin.pro
30+++ b/plugin/plugin.pro 31+++ b/plugin/plugin.pro
31@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) 32@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
@@ -46,5 +47,5 @@ index 5db82b7..de56688 100644
46+module Connman 47+module Connman
47 plugin ConnmanQtDeclarative 48 plugin ConnmanQtDeclarative
48-- 49--
491.8.1.2 502.11.0.windows.3
50 51
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"
5LICENSE = "Apache-2.0" 5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" 6LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
7DEPENDS += "qtbase qtdeclarative" 7DEPENDS += "qtbase qtdeclarative"
8PV = "1.1.10+git${SRCPV}" 8PV = "1.2.4+git${SRCPV}"
9 9
10SRCREV = "4d6def3053eaccaac04e4f9e03ee24dea8b9e8d8" 10SRCREV = "9d98e12ed60ae4fa9da62485cb8a82129ed1a464"
11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ 11SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ 12 file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
13" 13"
diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb
index 88df1351..18e9b8fd 100644
--- a/recipes-connectivity/libqofono/libqofono_git.bb
+++ b/recipes-connectivity/libqofono/libqofono_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5 5
6DEPENDS += "qtbase qtdeclarative" 6DEPENDS += "qtbase qtdeclarative"
7 7
8SRCREV = "54435de3bed0b454ef4ea3ea32c7234fcd9f24c6" 8SRCREV = "6916cd030b05f0bd137ea9b669fee48f20c19084"
9SRC_URI = "git://git.merproject.org/mer-core/libqofono.git" 9SRC_URI = "git://git.merproject.org/mer-core/libqofono.git"
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12PV = "0.87+gitr${SRCPV}" 12PV = "0.92+gitr${SRCPV}"
13 13
14inherit qmake5 14inherit qmake5
15 15