summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2016-06-10 21:37:09 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2016-06-13 09:46:56 +0000
commitbe55e296e65435a5ddff66453b7ccb3ba6670453 (patch)
tree8c81889dd12b49b2f167fc31607274e4780412ff /config.tests
parent35264972f9a398dfc8fdb447e5bf05607657a954 (diff)
Fixed a bunch of build and runtime issues for multi-process builds.
Auto-detection while building is much more consistent now and will complain about a missing libdbus-1 for multi-process builds. At runtime, both AM and QML clients will detect a non-working P2P DBus and output a meaningful error message immediately. Change-Id: Id4ccf89f516223d4458b79a4db87ca45e3c97289 Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/libdbus/libdbus.pro7
-rw-r--r--config.tests/libdbus/main.cpp49
2 files changed, 56 insertions, 0 deletions
diff --git a/config.tests/libdbus/libdbus.pro b/config.tests/libdbus/libdbus.pro
new file mode 100644
index 00000000..53854f80
--- /dev/null
+++ b/config.tests/libdbus/libdbus.pro
@@ -0,0 +1,7 @@
+TARGET = libdbus
+CONFIG -= qt
+
+SOURCES += main.cpp
+
+PKGCONFIG += "'dbus-1 >= 1.8'"
+CONFIG += link_pkgconfig
diff --git a/config.tests/libdbus/main.cpp b/config.tests/libdbus/main.cpp
new file mode 100644
index 00000000..04ea7c99
--- /dev/null
+++ b/config.tests/libdbus/main.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Pelagicore Application Manager.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company. For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#include <dbus/dbus.h>
+
+int main()
+{
+ int major, minor, micro;
+ dbus_get_version(&major, &minor, &micro);
+ return 0;
+}