diff options
| -rw-r--r-- | config.tests/libbb2/libbb2.pro | 5 | ||||
| -rw-r--r-- | config.tests/libbb2/main.cpp | 47 | ||||
| -rw-r--r-- | qtconnectivity.pro | 1 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 43 |
4 files changed, 85 insertions, 11 deletions
diff --git a/config.tests/libbb2/libbb2.pro b/config.tests/libbb2/libbb2.pro new file mode 100644 index 00000000..92c9b765 --- /dev/null +++ b/config.tests/libbb2/libbb2.pro @@ -0,0 +1,5 @@ +TEMPLATE = app + +TARGET = blackberry + +SOURCES += main.cpp diff --git a/config.tests/libbb2/main.cpp b/config.tests/libbb2/main.cpp new file mode 100644 index 00000000..0f7707f8 --- /dev/null +++ b/config.tests/libbb2/main.cpp @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** 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$ +** +****************************************************************************/ +#define BB_CORE_GLOBAL_HPP +#include "bb2/bb/Global" + +int main() +{ + return 0; +} diff --git a/qtconnectivity.pro b/qtconnectivity.pro index 40663d70..e2a73944 100644 --- a/qtconnectivity.pro +++ b/qtconnectivity.pro @@ -1,4 +1,5 @@ load(configure) qtCompileTest(bluez) qtCompileTest(btapi10_2_1) +qtCompileTest(libbb2) load(qt_parts) diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 249c65e4..7b88d4f0 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -59,7 +59,7 @@ CONFIG(blackberry) { NFC_BACKEND_AVAILABLE = yes DEFINES += QNX_NFC #QQNXNFC_DEBUG - LIBS += -lnfc -l:libbbsystem.so.2 + LIBS += -lnfc PRIVATE_HEADERS += \ qllcpserver_qnx_p.h \ @@ -67,20 +67,36 @@ CONFIG(blackberry) { qnearfieldmanager_qnx_p.h \ qnx/qnxnfcmanager_p.h \ qnearfieldtarget_qnx_p.h \ - qnx/qnxnfceventfilter_p.h \ - qnearfieldsharemanager_qnx_p.h \ - qnearfieldsharetarget_qnx_p.h \ - qnx/qnxnfcsharemanager_p.h + qnx/qnxnfceventfilter_p.h SOURCES += \ qllcpserver_qnx_p.cpp \ qllcpsocket_qnx_p.cpp \ qnearfieldmanager_qnx.cpp \ qnx/qnxnfcmanager.cpp \ - qnx/qnxnfceventfilter.cpp \ - qnearfieldsharemanager_qnx_p.cpp \ - qnearfieldsharetarget_qnx_p.cpp \ - qnx/qnxnfcsharemanager_p.cpp + qnx/qnxnfceventfilter.cpp + + config_libbb2 { + SOURCES += \ + qnearfieldsharemanager_qnx_p.cpp \ + qnearfieldsharetarget_qnx_p.cpp \ + qnx/qnxnfcsharemanager_p.cpp + + PRIVATE_HEADERS += \ + qnearfieldsharemanager_qnx_p.h \ + qnearfieldsharetarget_qnx_p.h \ + qnx/qnxnfcsharemanager_p.h + + LIBS += -l:libbbsystem.so.2 + } else { + SOURCES += \ + qnearfieldsharemanagerimpl_p.cpp \ + qnearfieldsharetargetimpl_p.cpp + + PRIVATE_HEADERS += \ + qnearfieldsharemanagerimpl_p.h \ + qnearfieldsharetargetimpl_p.h + } } simulator { @@ -92,13 +108,18 @@ simulator { qnearfieldmanagervirtualbase_p.h \ qnearfieldmanager_simulator_p.h \ qllcpsocket_simulator_p.h \ - qllcpserver_simulator_p.h + qllcpserver_simulator_p.h \ + qnearfieldsharemanagerimpl_p.h \ + qnearfieldsharetargetimpl_p.h + SOURCES += \ qnearfieldmanagervirtualbase.cpp \ qnearfieldmanager_simulator.cpp \ qllcpsocket_simulator_p.cpp \ - qllcpserver_simulator_p.cpp + qllcpserver_simulator_p.cpp \ + qnearfieldsharemanagerimpl_p.cpp \ + qnearfieldsharetargetimpl_p.cpp } isEmpty(NFC_BACKEND_AVAILABLE) { |