summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2013-10-15 14:25:18 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-17 16:05:22 +0200
commitf134638cb25a7fd6ff7ca4abacc8c68dce9fd9de (patch)
treea324e80eccadcc19db73a60119f80e8be6f2ee0b
parent413837fcc5cfb7bb57bb95ccf25f2f444f8c4998 (diff)
Introduce compile test for BT API 10.2.1
Change-Id: If4d805f49666cf9d09cc82c377f96398b7d4039c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--config.tests/btapi10_2_1/btapi10_2_1.pro7
-rw-r--r--config.tests/btapi10_2_1/main.cpp53
-rw-r--r--qtconnectivity.pro2
-rw-r--r--src/bluetooth/bluetooth.pro4
4 files changed, 65 insertions, 1 deletions
diff --git a/config.tests/btapi10_2_1/btapi10_2_1.pro b/config.tests/btapi10_2_1/btapi10_2_1.pro
new file mode 100644
index 00000000..0ad7b88a
--- /dev/null
+++ b/config.tests/btapi10_2_1/btapi10_2_1.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+
+TARGET = blackberry
+
+LIBS += -lbtapi
+
+SOURCES += main.cpp
diff --git a/config.tests/btapi10_2_1/main.cpp b/config.tests/btapi10_2_1/main.cpp
new file mode 100644
index 00000000..7f8bed3e
--- /dev/null
+++ b/config.tests/btapi10_2_1/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtConnectivity module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt 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 Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <btapi/btdevice.h>
+
+static void callback( bt_sdp_list_t *result, void *user_data, uint8_t error)
+{
+
+}
+
+int main()
+{
+ bt_rdev_sdp_search_async( 0, 0, &callback, 0 );
+ return 0;
+}
diff --git a/qtconnectivity.pro b/qtconnectivity.pro
index 8fd93a28..40663d70 100644
--- a/qtconnectivity.pro
+++ b/qtconnectivity.pro
@@ -1,4 +1,4 @@
load(configure)
qtCompileTest(bluez)
-
+qtCompileTest(btapi10_2_1)
load(qt_parts)
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index ebf6f500..98f3b3be 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -77,6 +77,10 @@ config_bluez:qtHaveModule(dbus) {
include(qnx/qnx.pri)
+ config_btapi10_2_1 {
+ DEFINES += QT_QNX_BT_BLUETOOTH
+ }
+
PRIVATE_HEADERS += \
qbluetoothtransferreply_qnx_p.h