mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-06-21 08:52:35 +02:00
libconnman-qt5: Drop upstreamed patch for MeeGo prefix removal
MeeGo prefix was made optional by sending the adjusted patch upstream. By defining "no-module-prefix" it will now build without prefix. Signed-off-by: Herman van Hazendonk <github.com@herrie.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
5bce6ae844
commit
9e6aaa8f33
@@ -1,43 +0,0 @@
|
||||
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/plugin.cpp | 2 +-
|
||||
plugin/plugin.pro | 2 +-
|
||||
plugin/qmldir | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/plugin/plugin.cpp
|
||||
+++ b/plugin/plugin.cpp
|
||||
@@ -34,7 +34,7 @@ static QObject *singleton_api_factory(QQ
|
||||
class ConnmanPlugin: public QQmlExtensionPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
- Q_PLUGIN_METADATA(IID "MeeGo.Connman")
|
||||
+ Q_PLUGIN_METADATA(IID "Connman")
|
||||
|
||||
public:
|
||||
void registerTypes(const char *uri);
|
||||
--- a/plugin/plugin.pro
|
||||
+++ b/plugin/plugin.pro
|
||||
@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TA
|
||||
QT += qml
|
||||
OTHER_FILES += plugin.json plugins.qmltypes qmldirs
|
||||
|
||||
-MODULENAME = MeeGo/Connman
|
||||
+MODULENAME = Connman
|
||||
TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
|
||||
|
||||
target.path = $$TARGETPATH
|
||||
--- a/plugin/qmldir
|
||||
+++ b/plugin/qmldir
|
||||
@@ -1,3 +1,3 @@
|
||||
-module MeeGo.Connman
|
||||
+module Connman
|
||||
plugin ConnmanQtDeclarative
|
||||
typeinfo plugins.qmltypes
|
||||
@@ -5,11 +5,10 @@ HOMEPAGE = "https://github.com/sailfishos/libconnman-qt"
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
PV = "1.2.35+git${SRCPV}"
|
||||
PV = "1.2.45+git${SRCPV}"
|
||||
|
||||
SRCREV = "347f20fe1a03bf0624f55b9108c797611e79f7d2"
|
||||
SRCREV = "1b1ef5693218b3e4f398a320b91ab84ea38d87d7"
|
||||
SRC_URI = "git://github.com/sailfishos/libconnman-qt.git;protocol=https;branch=master \
|
||||
file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
|
||||
file://0001-Add-missing-declarations-for-operator-overloads.patch \
|
||||
"
|
||||
|
||||
@@ -17,6 +16,8 @@ S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
EXTRA_QMAKEVARS_PRE = "CONFIG+=no-module-prefix"
|
||||
|
||||
RDEPENDS:${PN} += "connman"
|
||||
|
||||
do_install:append() {
|
||||
|
||||
Reference in New Issue
Block a user