Merge branch 'jb51056' into 'master'

[qtmpris] Switch to integrated build of qtdbusextended. JB#51056 See merge request mer-core/qtmpris!6
sailfishos · Sep 11, 2020 · 1f39c1a · 1f39c1a
2 parents 21a4f35 + 8be32de
commit 1f39c1a
Show file tree

Hide file tree

Showing 14 changed files with 700 additions and 7 deletions.
diff --git a/declarative/declarative.pro b/declarative/declarative.pro
@@ -8,7 +8,6 @@ INCLUDEPATH += ../src
 QT = core dbus qml
 
 LIBS += -L../src -l$${MPRISQTLIB}
-PKGCONFIG = dbusextended-qt5
 
 EXAMPLE = ../example/declarative/*
 

diff --git a/example/controller/controller.pro b/example/controller/controller.pro
@@ -9,7 +9,6 @@ QT += qml quick
 DEPENDPATH += ../../src
 INCLUDEPATH += ../../src
 LIBS += -L../../src -l$${MPRISQTLIB}
-PKGCONFIG = dbusextended-qt5
 
 SOURCES += \
     controller.cpp

diff --git a/example/player/player.pro b/example/player/player.pro
@@ -9,7 +9,6 @@ QT += qml quick
 DEPENDPATH += ../../src
 INCLUDEPATH += ../../src
 LIBS += -L../../src -l$${MPRISQTLIB}
-PKGCONFIG = dbusextended-qt5
 
 SOURCES += \
     player.cpp

diff --git a/mpris-qt.pro b/mpris-qt.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 declarative.depends = src
-SUBDIRS = src declarative
+src.depends = qtdbusextended
+SUBDIRS = src declarative qtdbusextended
diff --git a/qtdbusextended/DBusExtended b/qtdbusextended/DBusExtended
@@ -0,0 +1 @@
+#include "dbusextended.h"
diff --git a/qtdbusextended/DBusExtendedAbstractInterface b/qtdbusextended/DBusExtendedAbstractInterface
@@ -0,0 +1 @@
+#include "dbusextendedabstractinterface.h"
diff --git a/qtdbusextended/dbusextended.h b/qtdbusextended/dbusextended.h
@@ -0,0 +1,35 @@
+// -*- c++ -*-
+
+/*!
+ *
+ * Copyright (C) 2015 Jolla Ltd.
+ *
+ * Contact: Valerio Valerio <valerio.valerio@jolla.com>
+ * Author: Andres Gomez <andres.gomez@jolla.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#ifndef QT_DBUS_EXTENDED_H
+#define QT_DBUS_EXTENDED_H
+
+#if defined(QT_DBUS_EXTENDED_LIBRARY)
+#  define QT_DBUS_EXTENDED_EXPORT Q_DECL_EXPORT
+#else
+#  define QT_DBUS_EXTENDED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif /* QT_DBUS_EXTENDED_H */