diff options
25 files changed, 48 insertions, 355 deletions
diff --git a/doc/src/bluetooth-cpp.qdoc b/doc/src/bluetooth-cpp.qdoc index fff1734d..9cfc7566 100644 --- a/doc/src/bluetooth-cpp.qdoc +++ b/doc/src/bluetooth-cpp.qdoc @@ -87,9 +87,6 @@ The following sample applications show examples of API usage: \row \li \l{btscanner}{Bluetooth Scanner} \li Scan for Bluetooth devices. - \row - \li \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin} - \li A Service Framework plugin that enables sending files over Bluetooth through the Service Framework \endtable diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 72367a45..5e7720c4 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -51,9 +51,6 @@ \row \li \l{btscanner}{Bluetooth Scanner} \li Scan for Bluetooth devices. - \row - \li \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin} - \li A Service Framework plugin that enables sending files over Bluetooth through the Service Framework \endtable \section2 QML Examples diff --git a/doc/src/examples/bluetoothtransferplugin.qdoc b/doc/src/examples/bluetoothtransferplugin.qdoc deleted file mode 100644 index 6025aa37..00000000 --- a/doc/src/examples/bluetoothtransferplugin.qdoc +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt local connectivty modules. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example bluetoothtransferplugin - \title Bluetooth Transfer Plugin Example - - This example shows how to write a service plugin for the \l{Qt Service Framework}{Service Framework}. - - \section1 Registering the Service - The service can be registered by using the function \l{QServiceManager::}{addService()}, this takes a path to the XML file that describes the service, \li{bluetoothtransferservice.xml}. - - \section1 Writing the Plugin - To implement a plugin it is necessary to create a new plugin class derived from QObject and QServicePluginInterface. The function QServicePluginInterface::createInstance() is implemented to return the appropriate instantiated object based on the interface name passed into the function. Since there is only one interface name for this example there is no test involved, so we can simply create the object implementing the service and return its pointer. - - \snippet ../examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp createinstance - - The implementation of the service BluetoothTransfer is simply a test function for this example. The BluetoothTransfer class is very simple, with only an empty constructor and the sendFile() function - - \snippet ../examples/bluetoothtransferplugin/bluetoothtransfer.cpp sendFile - -*/ diff --git a/examples/annotatedurl/annotatedurl.pro b/examples/annotatedurl/annotatedurl.pro index c9a22afa..65ed7c8d 100644 --- a/examples/annotatedurl/annotatedurl.pro +++ b/examples/annotatedurl/annotatedurl.pro @@ -2,9 +2,6 @@ QT += nfc widgets CONFIG += strict_flags -INCLUDEPATH += $$PWD/../../src/connectivity/nfc -DEPENDPATH += $$PWD/../../src/connectivity/nfc - TARGET = annotatedurl SOURCES += main.cpp \ diff --git a/examples/bluetoothtransferplugin/bluetoothtransfer.cpp b/examples/bluetoothtransferplugin/bluetoothtransfer.cpp deleted file mode 100644 index 8301a9c7..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransfer.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtBluetooth module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore> - -#include "bluetoothtransfer.h" - -BluetoothTransfer::BluetoothTransfer(QObject *parent) - : QObject(parent) -{ -} - -//! [sendFile] -void BluetoothTransfer::sendFile(const QString &path) -{ - qDebug() << "BluetoothTransfer::sendFile()" << path; -} -//! [sendFile] diff --git a/examples/bluetoothtransferplugin/bluetoothtransfer.h b/examples/bluetoothtransferplugin/bluetoothtransfer.h deleted file mode 100644 index f2efd55a..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransfer.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtBluetooth module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BLUETOOTHTRANSFER_H -#define BLUETOOTHTRANSFER_H - -#include <QObject> - -class BluetoothTransfer : public QObject -{ - Q_OBJECT -public: - BluetoothTransfer(QObject *parent = 0); - -public slots: - void sendFile(const QString &path); -}; - - -#endif diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp b/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp deleted file mode 100644 index 8262b8a6..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtBluetooth module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qserviceinterfacedescriptor.h> - -#include "bluetoothtransferplugin.h" -#include "bluetoothtransfer.h" - -QObject* BluetoothTransferPlugin::createInstance(const QServiceInterfaceDescriptor& descriptor) -{ - Q_UNUSED(descriptor); - //! [createinstance] - return new BluetoothTransfer(this); - //! [createinstance] -} - -Q_EXPORT_PLUGIN2(serviceframework_bluetoothtransferplugin, BluetoothTransferPlugin) diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h b/examples/bluetoothtransferplugin/bluetoothtransferplugin.h deleted file mode 100644 index 40093fb0..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtBluetooth module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BLUETOOTHTRANSFERPLUGIN_H -#define BLUETOOTHTRANSFERPLUGIN_H - -#include <QObject> - -#include <qserviceplugininterface.h> - -class BluetoothTransferPlugin : public QObject, - public QServicePluginInterface -{ - Q_OBJECT - Q_INTERFACES(QServicePluginInterface) -public: - QObject* createInstance(const QServiceInterfaceDescriptor& descriptor); -}; - -#endif diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro deleted file mode 100644 index 9f3f3814..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -PLUGIN_TYPE=serviceframework - -QT += concurrent bluetooth serviceframework - -HEADERS += bluetoothtransferplugin.h \ - bluetoothtransfer.h -SOURCES += bluetoothtransferplugin.cpp \ - bluetoothtransfer.cpp -TARGET = serviceframework_bluetoothtransferplugin -DESTDIR = . - -xml.path = $$QT_MOBILITY_EXAMPLES/xmldata -xml.files = bluetoothtransferservice.xml -INSTALLS += xml diff --git a/examples/bluetoothtransferplugin/bluetoothtransferservice.xml b/examples/bluetoothtransferplugin/bluetoothtransferservice.xml deleted file mode 100644 index eeeb76be..00000000 --- a/examples/bluetoothtransferplugin/bluetoothtransferservice.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<SFW version="1.1"> -<service> - <name>BluetoothTransferService</name> - <filepath>serviceframework_bluetoothtransferplugin</filepath> - <description>Example Bluetooth transfer service</description> - <interface> - <name>com.nokia.qt.examples.FileTransfer</name> - <version>1.0</version> - <description>Implementation of FileTransferInterface</description> - </interface> -</service> -</SFW> diff --git a/examples/btchat/btchat.pro b/examples/btchat/btchat.pro index 28e1692a..f215cb87 100644 --- a/examples/btchat/btchat.pro +++ b/examples/btchat/btchat.pro @@ -1,10 +1,8 @@ +TEMPLATE = app TARGET = btchat QT += concurrent bluetooth widgets -INCLUDEPATH += ../../src/connectivity/bluetooth -DEPENDPATH += ../../src/connectivity/bluetooth - SOURCES = \ main.cpp \ chat.cpp \ diff --git a/examples/btchat/remoteselector.h b/examples/btchat/remoteselector.h index 68908130..2bf67d9c 100644 --- a/examples/btchat/remoteselector.h +++ b/examples/btchat/remoteselector.h @@ -52,9 +52,11 @@ QT_FORWARD_DECLARE_CLASS(QListWidgetItem) QTBLUETOOTH_USE_NAMESPACE +QT_BEGIN_NAMESPACE namespace Ui { class RemoteSelector; } +QT_END_NAMESPACE class RemoteSelector : public QDialog { diff --git a/examples/btfiletransfer/btfiletransfer.pro b/examples/btfiletransfer/btfiletransfer.pro index 071941ee..bc634193 100644 --- a/examples/btfiletransfer/btfiletransfer.pro +++ b/examples/btfiletransfer/btfiletransfer.pro @@ -1,10 +1,8 @@ +TEMPLATE = app TARGET = btfiletransfer QT += concurrent bluetooth widgets -INCLUDEPATH += ../../src/connectivity/bluetooth -DEPENDPATH += ../../src/connectivity/bluetooth - SOURCES = \ main.cpp \ remoteselector.cpp \ diff --git a/examples/btfiletransfer/pindisplay.h b/examples/btfiletransfer/pindisplay.h index 0fb6116c..bc24c923 100644 --- a/examples/btfiletransfer/pindisplay.h +++ b/examples/btfiletransfer/pindisplay.h @@ -43,9 +43,11 @@ #include <QDialog> +QT_BEGIN_NAMESPACE namespace Ui { class pinDisplay; } +QT_END_NAMESPACE class pinDisplay : public QDialog { diff --git a/examples/btfiletransfer/progress.h b/examples/btfiletransfer/progress.h index 1af21574..e72a7fc9 100644 --- a/examples/btfiletransfer/progress.h +++ b/examples/btfiletransfer/progress.h @@ -51,9 +51,11 @@ QTBLUETOOTH_END_NAMESPACE QTBLUETOOTH_USE_NAMESPACE +QT_BEGIN_NAMESPACE namespace Ui { class Progress; } +QT_END_NAMESPACE class Progress : public QDialog { diff --git a/examples/btfiletransfer/remoteselector.h b/examples/btfiletransfer/remoteselector.h index d6c60ad0..a58ad91f 100644 --- a/examples/btfiletransfer/remoteselector.h +++ b/examples/btfiletransfer/remoteselector.h @@ -57,9 +57,11 @@ class pinDisplay; QTBLUETOOTH_USE_NAMESPACE +QT_BEGIN_NAMESPACE namespace Ui { class RemoteSelector; } +QT_END_NAMESPACE class RemoteSelector : public QDialog { diff --git a/examples/btscanner/btscanner.pro b/examples/btscanner/btscanner.pro index b09bf294..cc4675b2 100644 --- a/examples/btscanner/btscanner.pro +++ b/examples/btscanner/btscanner.pro @@ -1,8 +1,5 @@ TARGET = btscanner -INCLUDEPATH += ../../src/connectivity/bluetooth -DEPENDPATH += ../../src/connectivity/bluetooth - QT += concurrent bluetooth widgets TEMPLATE = app diff --git a/examples/bttennis/bttennis.pro b/examples/bttennis/bttennis.pro index 85a93c95..39e33dcf 100644 --- a/examples/bttennis/bttennis.pro +++ b/examples/bttennis/bttennis.pro @@ -1,14 +1,8 @@ +TEMPLATE = app TARGET = bttennis -INCLUDEPATH += \ - ../../src/connectivity/bluetooth \ - ../../src/connectivity/nfc - -DEPENDPATH += \ - ../../src/connectivity/bluetooth \ - ../../src/connectivity/nfc - -QT += concurrent bluetooth nfc widgets +QT += concurrent bluetooth widgets +#QT += nfc SOURCES = \ main.cpp \ @@ -17,8 +11,8 @@ SOURCES = \ controller.cpp \ tennisserver.cpp \ tennisclient.cpp \ - tennisview.cpp \ - handover.cpp + tennisview.cpp +# handover.cpp HEADERS = \ board.h \ @@ -26,8 +20,8 @@ HEADERS = \ controller.h \ tennisserver.h \ tennisclient.h \ - tennisview.h \ - handover.h + tennisview.h +# handover.h FORMS = \ tennis.ui diff --git a/examples/bttennis/tennis.cpp b/examples/bttennis/tennis.cpp index eb012f9a..1501d7a8 100644 --- a/examples/bttennis/tennis.cpp +++ b/examples/bttennis/tennis.cpp @@ -53,7 +53,7 @@ #include "tennisserver.h" #include "tennisclient.h" -#include "handover.h" +//#include "handover.h" #include <qbluetooth.h> #include <qbluetoothdeviceinfo.h> @@ -61,13 +61,13 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothlocaldevice.h> -#include <qnearfieldmanager.h> -#include <qllcpserver.h> -#include <qllcpsocket.h> +//#include <qnearfieldmanager.h> +//#include <qllcpserver.h> +//#include <qllcpsocket.h> Tennis::Tennis(QWidget *parent) : QDialog(parent), ui(new Ui_Tennis), board(new Board), controller(new Controller), socket(0), - m_discoveryAgent(new QBluetoothServiceDiscoveryAgent), m_handover(0) + m_discoveryAgent(new QBluetoothServiceDiscoveryAgent)//, m_handover(0) { // start Bluetooth if not started QBluetoothLocalDevice *device = new QBluetoothLocalDevice(); @@ -139,7 +139,7 @@ Tennis::Tennis(QWidget *parent) // ui->pongView->setBackgroundBrush(QBrush(Qt::white)); ui->pongView->setCacheMode(QGraphicsView::CacheBackground); - QNearFieldManager nearFieldManager; +/* QNearFieldManager nearFieldManager; if (nearFieldManager.isAvailable()) { m_handover = new Handover(server->serverPort(), this); connect(m_handover, SIGNAL(bluetoothServiceChanged()), this, SLOT(nearFieldHandover())); @@ -147,7 +147,7 @@ Tennis::Tennis(QWidget *parent) connect(m_discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), this, SLOT(serviceDiscovered(QBluetoothServiceInfo))); connect(m_discoveryAgent, SIGNAL(finished()), this, SLOT(discoveryFinished())); - } + }*/ m_discoveryAgent->setUuidFilter(QBluetoothUuid(serviceUuid)); @@ -188,9 +188,9 @@ Tennis::Tennis(QWidget *parent) service.setDevice(device); client->startClient(service); board->setStatus("Connecting", 100, 25); - } else if (nearFieldManager.isAvailable()) { + } /*else if (nearFieldManager.isAvailable()) { board->setStatus(tr("Touch to play"), 100, 25); - } + }*/ setEnabled(true); @@ -394,7 +394,7 @@ void Tennis::lagReport(int ms) } } -void Tennis::nearFieldHandover() +/*void Tennis::nearFieldHandover() { qDebug() << "Connecting to NFC provided address" << m_handover->bluetoothAddress().toString(); @@ -415,7 +415,7 @@ void Tennis::nearFieldHandover() client->startClient(service); board->setStatus(tr("Connecting: %1 %2").arg(m_handover->bluetoothAddress().toString()).arg(m_handover->serverPort()), 100, 25); -} +}*/ void Tennis::fps(const QString &f) { diff --git a/examples/bttennis/tennis.h b/examples/bttennis/tennis.h index 1664497a..0e86d488 100644 --- a/examples/bttennis/tennis.h +++ b/examples/bttennis/tennis.h @@ -65,7 +65,7 @@ static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9"); class TennisServer; class TennisClient; -class Handover; +//class Handover; //! [declaration] class Tennis : public QDialog @@ -105,7 +105,7 @@ private slots: void lagReport(int ms); - void nearFieldHandover(); +// void nearFieldHandover(); void fps(const QString &f); @@ -135,6 +135,6 @@ private: QPropertyAnimation *paddleAnimation; QBluetoothServiceDiscoveryAgent *m_discoveryAgent; - Handover *m_handover; +// Handover *m_handover; }; //! [declaration] diff --git a/examples/bttennis/tennisclient.h b/examples/bttennis/tennisclient.h index 2bbd871d..430e8882 100644 --- a/examples/bttennis/tennisclient.h +++ b/examples/bttennis/tennisclient.h @@ -53,7 +53,9 @@ QTBLUETOOTH_BEGIN_NAMESPACE class QBluetoothSocket; QTBLUETOOTH_END_NAMESPACE +QT_BEGIN_NAMESPACE class QDataStream; +QT_END_NAMESPACE QTBLUETOOTH_USE_NAMESPACE diff --git a/examples/examples.pro b/examples/examples.pro new file mode 100644 index 00000000..c8c9d1f9 --- /dev/null +++ b/examples/examples.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs +SUBDIRS += btchat \ + btscanner \ + btfiletransfer \ + bttennis \ + scanner + +#Qt NFC based examples +#SUBDIRS += poster \ +# ndefeditor \ +# annotatedurl diff --git a/examples/ndefeditor/ndefeditor.pro b/examples/ndefeditor/ndefeditor.pro index e5ddd963..47971fdb 100644 --- a/examples/ndefeditor/ndefeditor.pro +++ b/examples/ndefeditor/ndefeditor.pro @@ -1,6 +1,3 @@ -INCLUDEPATH += $$PWD/../../src/connectivity/nfc -DEPENDPATH += $$PWD/../../src/connectivity/nfc - QT += nfc widgets TARGET = ndefeditor diff --git a/examples/scanner/scanner.qml b/examples/scanner/scanner.qml index 0ba5a291..dc8064c4 100644 --- a/examples/scanner/scanner.qml +++ b/examples/scanner/scanner.qml @@ -38,24 +38,20 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 import QtBluetooth 5.0 -Rectangle { +Item { id: top property BluetoothService currentService property alias minimalDiscovery: myModel.minimalDiscovery - property alias uuidFilder: myModel.uuidFilter - - anchors.fill: parent BluetoothDiscoveryModel { id: myModel minimalDiscovery: true onDiscoveryChanged: busy.running = discovery; -// onNewServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName); -// uuidFilter: "e8e10f95-1a70-4b27-9ccf-02010264e9c9" + onNewServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName); } Rectangle { @@ -192,7 +188,6 @@ Rectangle { id: mainList width: top.width anchors.top: busy.bottom -// anchors.bottom: top.bottom anchors.bottom: fullbutton.top model: myModel diff --git a/qtconnectivity.pro b/qtconnectivity.pro index 879bafc5..d7df2578 100644 --- a/qtconnectivity.pro +++ b/qtconnectivity.pro @@ -22,6 +22,6 @@ module_qtconnectivity_examples.depends = module_qtconnectivity_src SUBDIRS += module_qtconnectivity_src \ module_qtconnectivity_tests \ - #module_qtconnectivity_examples # there are no examples yet + module_qtconnectivity_examples include(doc/doc.pri) |