aboutsummaryrefslogtreecommitdiffstats
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)
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 @@
-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 \
"
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"
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "54435de3bed0b454ef4ea3ea32c7234fcd9f24c6"
+SRCREV = "6916cd030b05f0bd137ea9b669fee48f20c19084"
SRC_URI = "git://git.merproject.org/mer-core/libqofono.git"
S = "${WORKDIR}/git"
-PV = "0.87+gitr${SRCPV}"
+PV = "0.92+gitr${SRCPV}"
inherit qmake5