diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-09-25 15:20:41 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 14:43:52 +0200 |
commit | d8a179128c0fa8e9cc482df58b9334c696602be6 (patch) | |
tree | dd5032440aa87dfd63c973265adc9947db0918f6 /examples | |
parent | 9d89c661395347bdda9362a77d38c86ad60f486b (diff) |
Qt Bluetooth: Modularized documentation
-moved documentation to src/bluetooth/doc
-added a qdocconf file for Qt Bluetooth
-fixed relative paths for snippets
-moved examples to examples/bluetooth
Change-Id: Id41bac50dca628400568d191f1c3ccfbaac790a1
Reviewed-by: Alex <ablasche@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/bluetooth/bluetooth.pro | 9 | ||||
-rw-r--r-- | examples/bluetooth/btchat/btchat.pro (renamed from examples/btchat/btchat.pro) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chat.cpp (renamed from examples/btchat/chat.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chat.h (renamed from examples/btchat/chat.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chat.ui (renamed from examples/btchat/chat.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chatclient.cpp (renamed from examples/btchat/chatclient.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chatclient.h (renamed from examples/btchat/chatclient.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chatserver.cpp (renamed from examples/btchat/chatserver.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/chatserver.h (renamed from examples/btchat/chatserver.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/doc/images/btchat-example.png | bin | 0 -> 6527 bytes | |||
-rw-r--r-- | examples/bluetooth/btchat/doc/src/btchat.qdoc | 191 | ||||
-rw-r--r-- | examples/bluetooth/btchat/main.cpp (renamed from examples/btchat/main.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/remoteselector.cpp (renamed from examples/btchat/remoteselector.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/remoteselector.h (renamed from examples/btchat/remoteselector.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btchat/remoteselector.ui (renamed from examples/btchat/remoteselector.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/btfiletransfer.pro (renamed from examples/btfiletransfer/btfiletransfer.pro) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/btfiletransfer.qrc (renamed from examples/btfiletransfer/btfiletransfer.qrc) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/busy.gif (renamed from examples/btfiletransfer/busy.gif) | bin | 847 -> 847 bytes | |||
-rw-r--r-- | examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png | bin | 0 -> 44606 bytes | |||
-rw-r--r-- | examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc | 37 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/main.cpp (renamed from examples/btfiletransfer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/pairing.gif (renamed from examples/btfiletransfer/pairing.gif) | bin | 3951 -> 3951 bytes | |||
-rw-r--r-- | examples/bluetooth/btfiletransfer/pindisplay.cpp (renamed from examples/btfiletransfer/pindisplay.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/pindisplay.h (renamed from examples/btfiletransfer/pindisplay.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/pindisplay.ui (renamed from examples/btfiletransfer/pindisplay.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/progress.cpp (renamed from examples/btfiletransfer/progress.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/progress.h (renamed from examples/btfiletransfer/progress.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/progress.ui (renamed from examples/btfiletransfer/progress.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/remoteselector.cpp (renamed from examples/btfiletransfer/remoteselector.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/remoteselector.h (renamed from examples/btfiletransfer/remoteselector.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btfiletransfer/remoteselector.ui (renamed from examples/btfiletransfer/remoteselector.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/btscanner.pro (renamed from examples/btscanner/btscanner.pro) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/device.cpp (renamed from examples/btscanner/device.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/device.h (renamed from examples/btscanner/device.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/device.ui (renamed from examples/btscanner/device.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/doc/images/btscanner-example.png | bin | 0 -> 76746 bytes | |||
-rw-r--r-- | examples/bluetooth/btscanner/doc/src/btscanner.qdoc | 36 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/main.cpp (renamed from examples/btscanner/main.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/service.cpp (renamed from examples/btscanner/service.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/service.h (renamed from examples/btscanner/service.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/btscanner/service.ui (renamed from examples/btscanner/service.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/board.cpp (renamed from examples/bttennis/board.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/board.h (renamed from examples/bttennis/board.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/bttennis.pro (renamed from examples/bttennis/bttennis.pro) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/connect.png (renamed from examples/bttennis/connect.png) | bin | 11074 -> 11074 bytes | |||
-rw-r--r-- | examples/bluetooth/bttennis/controller.cpp (renamed from examples/bttennis/controller.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/controller.h (renamed from examples/bttennis/controller.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/doc/images/bttennis-example.png | bin | 0 -> 4890 bytes | |||
-rw-r--r-- | examples/bluetooth/bttennis/doc/src/bttennis.qdoc | 37 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/handover.cpp (renamed from examples/bttennis/handover.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/handover.h (renamed from examples/bttennis/handover.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/main.cpp (renamed from examples/bttennis/main.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennis.cpp (renamed from examples/bttennis/tennis.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennis.h (renamed from examples/bttennis/tennis.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennis.qrc (renamed from examples/bttennis/tennis.qrc) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennis.ui (renamed from examples/bttennis/tennis.ui) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisclient.cpp (renamed from examples/bttennis/tennisclient.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisclient.h (renamed from examples/bttennis/tennisclient.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisserver.cpp (renamed from examples/bttennis/tennisserver.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisserver.h (renamed from examples/bttennis/tennisserver.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisview.cpp (renamed from examples/bttennis/tennisview.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/bttennis/tennisview.h (renamed from examples/bttennis/tennisview.h) | 0 | ||||
-rw-r--r-- | examples/bluetooth/scanner/qmlscanner.cpp (renamed from examples/scanner/qmlscanner.cpp) | 0 | ||||
-rw-r--r-- | examples/bluetooth/scanner/scanner.pro (renamed from examples/scanner/scanner.pro) | 0 | ||||
-rw-r--r-- | examples/bluetooth/scanner/scanner.qml (renamed from examples/scanner/scanner.qml) | 0 | ||||
-rw-r--r-- | examples/bluetooth/scanner/scanner.qrc (renamed from examples/scanner/scanner.qrc) | 0 | ||||
-rw-r--r-- | examples/examples.pro | 7 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.cpp (renamed from examples/annotatedurl/annotatedurl.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.h (renamed from examples/annotatedurl/annotatedurl.h) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.pro (renamed from examples/annotatedurl/annotatedurl.pro) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/doc/images/annotatedurl.png | bin | 0 -> 34341 bytes | |||
-rw-r--r-- | examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc | 37 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/main.cpp (renamed from examples/annotatedurl/main.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/mainwindow.cpp (renamed from examples/annotatedurl/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/mainwindow.h (renamed from examples/annotatedurl/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/mainwindow.ui (renamed from examples/annotatedurl/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/doc/images/ndefeditor.png | bin | 0 -> 24500 bytes | |||
-rw-r--r-- | examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc | 36 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/main.cpp (renamed from examples/ndefeditor/main.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mainwindow.cpp (renamed from examples/ndefeditor/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mainwindow.h (renamed from examples/ndefeditor/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mainwindow.ui (renamed from examples/ndefeditor/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mimeimagerecordeditor.cpp (renamed from examples/ndefeditor/mimeimagerecordeditor.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mimeimagerecordeditor.h (renamed from examples/ndefeditor/mimeimagerecordeditor.h) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/mimeimagerecordeditor.ui (renamed from examples/ndefeditor/mimeimagerecordeditor.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/ndefeditor.pro (renamed from examples/ndefeditor/ndefeditor.pro) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/textrecord.ui (renamed from examples/ndefeditor/textrecord.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/textrecordeditor.cpp (renamed from examples/ndefeditor/textrecordeditor.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/textrecordeditor.h (renamed from examples/ndefeditor/textrecordeditor.h) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/textrecordeditor.ui (renamed from examples/ndefeditor/textrecordeditor.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/urirecordeditor.cpp (renamed from examples/ndefeditor/urirecordeditor.cpp) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/urirecordeditor.h (renamed from examples/ndefeditor/urirecordeditor.h) | 0 | ||||
-rw-r--r-- | examples/nfc/ndefeditor/urirecordeditor.ui (renamed from examples/ndefeditor/urirecordeditor.ui) | 0 | ||||
-rw-r--r-- | examples/nfc/poster/doc/images/qml-poster-example.png | bin | 0 -> 54257 bytes | |||
-rw-r--r-- | examples/nfc/poster/doc/src/poster.qdoc | 38 | ||||
-rw-r--r-- | examples/nfc/poster/poster.pro (renamed from examples/poster/poster.pro) | 0 | ||||
-rw-r--r-- | examples/nfc/poster/poster.qml (renamed from examples/poster/poster.qml) | 0 | ||||
-rw-r--r-- | examples/nfc/poster/poster.qrc (renamed from examples/poster/poster.qrc) | 0 | ||||
-rw-r--r-- | examples/nfc/poster/qmlposter.cpp (renamed from examples/poster/qmlposter.cpp) | 0 |
99 files changed, 423 insertions, 5 deletions
diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro new file mode 100644 index 00000000..20bf6c6d --- /dev/null +++ b/examples/bluetooth/bluetooth.pro @@ -0,0 +1,9 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets) { + SUBDIRS += btchat \ + btscanner \ + btfiletransfer \ + bttennis +} + +SUBDIRS += scanner diff --git a/examples/btchat/btchat.pro b/examples/bluetooth/btchat/btchat.pro index f215cb87..f215cb87 100644 --- a/examples/btchat/btchat.pro +++ b/examples/bluetooth/btchat/btchat.pro diff --git a/examples/btchat/chat.cpp b/examples/bluetooth/btchat/chat.cpp index 7047cbdd..7047cbdd 100644 --- a/examples/btchat/chat.cpp +++ b/examples/bluetooth/btchat/chat.cpp diff --git a/examples/btchat/chat.h b/examples/bluetooth/btchat/chat.h index 740999d0..740999d0 100644 --- a/examples/btchat/chat.h +++ b/examples/bluetooth/btchat/chat.h diff --git a/examples/btchat/chat.ui b/examples/bluetooth/btchat/chat.ui index acebc937..acebc937 100644 --- a/examples/btchat/chat.ui +++ b/examples/bluetooth/btchat/chat.ui diff --git a/examples/btchat/chatclient.cpp b/examples/bluetooth/btchat/chatclient.cpp index 8ea66e51..8ea66e51 100644 --- a/examples/btchat/chatclient.cpp +++ b/examples/bluetooth/btchat/chatclient.cpp diff --git a/examples/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h index 710634e5..710634e5 100644 --- a/examples/btchat/chatclient.h +++ b/examples/bluetooth/btchat/chatclient.h diff --git a/examples/btchat/chatserver.cpp b/examples/bluetooth/btchat/chatserver.cpp index 545a0b03..545a0b03 100644 --- a/examples/btchat/chatserver.cpp +++ b/examples/bluetooth/btchat/chatserver.cpp diff --git a/examples/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h index ee4728a9..ee4728a9 100644 --- a/examples/btchat/chatserver.h +++ b/examples/bluetooth/btchat/chatserver.h diff --git a/examples/bluetooth/btchat/doc/images/btchat-example.png b/examples/bluetooth/btchat/doc/images/btchat-example.png Binary files differnew file mode 100644 index 00000000..762d49cb --- /dev/null +++ b/examples/bluetooth/btchat/doc/images/btchat-example.png diff --git a/examples/bluetooth/btchat/doc/src/btchat.qdoc b/examples/bluetooth/btchat/doc/src/btchat.qdoc new file mode 100644 index 00000000..20f1ad93 --- /dev/null +++ b/examples/bluetooth/btchat/doc/src/btchat.qdoc @@ -0,0 +1,191 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example btchat + \title Bluetooth Chat Example + + The Bluetooth Chat example shows how to use the Qt Connectivity Bluetooth API to communicate + with another application on a remote device using Bluetooth. + + \image btchat-example.png + + The Bluetooth Chat example implements a simple chat program between multiple parties. The + application always acts as both a server and a client eliminating the need to determine who + should connect to whom. + + \section1 Chat Server + + The chat server is implemented by the ChatServer class. The ChatServer class is declared as: + + \snippet btchat/chatserver.h declaration + + The first thing the chat server needs to do is create an instance of QRfcommServer to listen + for incoming Bluetooth connections. Our clientConnected() slot will be called whenever a new + connection is created. + + \snippet btchat/chatserver.cpp Create the server + + The chat server is only useful if others know that it is there. To enable other devices to + discover it a record describing the service needs to be published in the systems SDP (Service + Discovery Protocol) database. The QBluetoothServiceInfo class encapsulates a service record. + + We will publish a service record that contains some textural descriptions of the services, a + UUID that uniquely identifies the service, the discoverability attribute and connection + parameters. + + The textural description of the service is stored in the ServiceName, ServiceDescription and + ServiceProvider attributes. + + \snippet btchat/chatserver.cpp Service name, description and provider + + Bluetooth uses UUIDs as unique identifiers. Our chat service is uses a randomly generated + UUID. + + \snippet btchat/chatserver.cpp Service UUID + \snippet btchat/chatserver.cpp Service UUID set + + A Bluetooth service is only discoverable if it is in the PublicBrowseGroup. + + \snippet btchat/chatserver.cpp Service Discoverability + + The ProtocolDescriptorList attribute is used to publish the connection parameters that the + remote device requires to connect to our service. Here we specify that the Rfcomm protocol is + used and set the port number to port that our rfcommServer instance is listening to. + + \snippet btchat/chatserver.cpp Protocol descriptor list + + Finally we register the service record with the system. + + \snippet btchat/chatserver.cpp Register service + + As mentioned earlier incoming connections are handled in the clientConnected() slot. In this + slot we get a pointer a QBluetoothSocket representing the next pending connection connect up + slots to the readyRead() and disconnected() signals and emit a signal to notify others that a + new client has connected. + + \snippet btchat/chatserver.cpp clientConnected + + The readSocket() slot is called whenever data is ready to be read from a client socket. The + slot reads individual lines from the socket converts them from UTF-8 and emits the + messageReceived() signal. + + \snippet btchat/chatserver.cpp readSocket + + The clientDisconnected() slot is called whenever a client disconnects from the service. The + slot emits a signal to notify others that a client has disconnected and deletes the socket. + + \snippet btchat/chatserver.cpp clientDisconnected + + The sendMessage() slot is used to send a message to all connected clients. The message is + converted into UTF-8 and appended with a newline before being sent to all clients. + + \snippet btchat/chatserver.cpp sendMessage + + When the chat server is stop the service record is removed from the system SDP database, all + connected client sockets are deleted and the QRfcommServer instance is deleted. + + \snippet btchat/chatserver.cpp stopServer + + \section1 Chat Client + + The chat client is implemented by the ChatClient class. The ChatClient class is declared as: + + \snippet btchat/chatclient.h declaration + + The client creates a new QBluetoothSocket and connects to the remote service described by the + \e remoteService parameter. Slots are connected to the sockets readyRead(), connected() and + disconnected() signals. + + \snippet btchat/chatclient.cpp startClient + + On sucessfull socket connection we emit a signal to notify other. + + \snippet btchat/chatclient.cpp connected + + Similarily to the chat server the readSocket() slot is called when data is available from the + socket. Lines are read individually and converted from UTF-8. The messageReceived() signal + is emitted. + + \snippet btchat/chatclient.cpp readSocket + + The sendMessage() slot is used to send a message to the remote device. The message is + converted to UTF-8 and a newline appended. + + \snippet btchat/chatclient.cpp sendMessage + + To disconnect from the remote chat service the QBluetoothSocket instance is deleted. + + \snippet btchat/chatclient.cpp stopClient + + \section1 Chat Dialog + + The main window of this example is the chat dialog, implemented in the Chat class. This class + displays a chat session between a single ChatServer and zero or more ChatClients. The Chat + class is declared as: + + \snippet btchat/chat.h declaration + + First we construct the user interface + + \snippet btchat/chat.cpp Construct UI + + We create an instance of the ChatServer and respond to its clientConnected(), + clientDiconnected() and messageReceived() signals. + + \snippet btchat/chat.cpp Create Chat Server + + In response to the clientConnected() and clientDisconnected() signals of the ChatServer we + display the typical "foo has joined chat." and "foo has left." messages in the chat session. + + \snippet btchat/chat.cpp clientConnected clientDisconnected + + Incoming messages from clients connected to the ChatServer are handled in the showMessage() + slot. The message text tagged with the remote device name is displayed in the chat session. + + \snippet btchat/chat.cpp showMessage + + In response to the connect button being clicked the application starts service discovery and + presents a list of discovered chat services on remote devices. A ChatClient for the service + selected by the user. + + \snippet btchat/chat.cpp Connect to remote service + + In reponse to connected() signals from ChatClient we display the a "Joined chat with foo." + message in the chat session. + + \snippet btchat/chat.cpp connected + + Messages are sent to all remote devices via the ChatServer and ChatClient instances by emitting + the sendMessage() signal. + + \snippet btchat/chat.cpp sendClicked + + We need to clean up ChatClient instances when the remote device forces a disconnect. + + \snippet btchat/chat.cpp clientDisconnected +*/ diff --git a/examples/btchat/main.cpp b/examples/bluetooth/btchat/main.cpp index cb32f448..cb32f448 100644 --- a/examples/btchat/main.cpp +++ b/examples/bluetooth/btchat/main.cpp diff --git a/examples/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp index a63c81c2..a63c81c2 100644 --- a/examples/btchat/remoteselector.cpp +++ b/examples/bluetooth/btchat/remoteselector.cpp diff --git a/examples/btchat/remoteselector.h b/examples/bluetooth/btchat/remoteselector.h index eff94895..eff94895 100644 --- a/examples/btchat/remoteselector.h +++ b/examples/bluetooth/btchat/remoteselector.h diff --git a/examples/btchat/remoteselector.ui b/examples/bluetooth/btchat/remoteselector.ui index d415f416..d415f416 100644 --- a/examples/btchat/remoteselector.ui +++ b/examples/bluetooth/btchat/remoteselector.ui diff --git a/examples/btfiletransfer/btfiletransfer.pro b/examples/bluetooth/btfiletransfer/btfiletransfer.pro index bc634193..bc634193 100644 --- a/examples/btfiletransfer/btfiletransfer.pro +++ b/examples/bluetooth/btfiletransfer/btfiletransfer.pro diff --git a/examples/btfiletransfer/btfiletransfer.qrc b/examples/bluetooth/btfiletransfer/btfiletransfer.qrc index 10697d5b..10697d5b 100644 --- a/examples/btfiletransfer/btfiletransfer.qrc +++ b/examples/bluetooth/btfiletransfer/btfiletransfer.qrc diff --git a/examples/btfiletransfer/busy.gif b/examples/bluetooth/btfiletransfer/busy.gif Binary files differindex e192ca89..e192ca89 100644 --- a/examples/btfiletransfer/busy.gif +++ b/examples/bluetooth/btfiletransfer/busy.gif diff --git a/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png Binary files differnew file mode 100644 index 00000000..f98241d6 --- /dev/null +++ b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png diff --git a/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc new file mode 100644 index 00000000..200b3d6f --- /dev/null +++ b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example btfiletransfer + \title Bluetooth File Transfer Example + + The Bluetooth File Transfer example is an application to transfer files + via a bluetooth connection. + + \image btfiletransfer-example.png + +*/ diff --git a/examples/btfiletransfer/main.cpp b/examples/bluetooth/btfiletransfer/main.cpp index 4362c023..4362c023 100644 --- a/examples/btfiletransfer/main.cpp +++ b/examples/bluetooth/btfiletransfer/main.cpp diff --git a/examples/btfiletransfer/pairing.gif b/examples/bluetooth/btfiletransfer/pairing.gif Binary files differindex e147f3ec..e147f3ec 100644 --- a/examples/btfiletransfer/pairing.gif +++ b/examples/bluetooth/btfiletransfer/pairing.gif diff --git a/examples/btfiletransfer/pindisplay.cpp b/examples/bluetooth/btfiletransfer/pindisplay.cpp index bdef6b36..bdef6b36 100644 --- a/examples/btfiletransfer/pindisplay.cpp +++ b/examples/bluetooth/btfiletransfer/pindisplay.cpp diff --git a/examples/btfiletransfer/pindisplay.h b/examples/bluetooth/btfiletransfer/pindisplay.h index fd1b50aa..fd1b50aa 100644 --- a/examples/btfiletransfer/pindisplay.h +++ b/examples/bluetooth/btfiletransfer/pindisplay.h diff --git a/examples/btfiletransfer/pindisplay.ui b/examples/bluetooth/btfiletransfer/pindisplay.ui index 02bf7d50..02bf7d50 100644 --- a/examples/btfiletransfer/pindisplay.ui +++ b/examples/bluetooth/btfiletransfer/pindisplay.ui diff --git a/examples/btfiletransfer/progress.cpp b/examples/bluetooth/btfiletransfer/progress.cpp index d589e9b5..d589e9b5 100644 --- a/examples/btfiletransfer/progress.cpp +++ b/examples/bluetooth/btfiletransfer/progress.cpp diff --git a/examples/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index 400c9b70..400c9b70 100644 --- a/examples/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h diff --git a/examples/btfiletransfer/progress.ui b/examples/bluetooth/btfiletransfer/progress.ui index 3b151f06..3b151f06 100644 --- a/examples/btfiletransfer/progress.ui +++ b/examples/bluetooth/btfiletransfer/progress.ui diff --git a/examples/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index 80d8761e..80d8761e 100644 --- a/examples/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp diff --git a/examples/btfiletransfer/remoteselector.h b/examples/bluetooth/btfiletransfer/remoteselector.h index d3300c9a..d3300c9a 100644 --- a/examples/btfiletransfer/remoteselector.h +++ b/examples/bluetooth/btfiletransfer/remoteselector.h diff --git a/examples/btfiletransfer/remoteselector.ui b/examples/bluetooth/btfiletransfer/remoteselector.ui index f99deaa7..f99deaa7 100644 --- a/examples/btfiletransfer/remoteselector.ui +++ b/examples/bluetooth/btfiletransfer/remoteselector.ui diff --git a/examples/btscanner/btscanner.pro b/examples/bluetooth/btscanner/btscanner.pro index cc4675b2..cc4675b2 100644 --- a/examples/btscanner/btscanner.pro +++ b/examples/bluetooth/btscanner/btscanner.pro diff --git a/examples/btscanner/device.cpp b/examples/bluetooth/btscanner/device.cpp index 33b96dc3..33b96dc3 100644 --- a/examples/btscanner/device.cpp +++ b/examples/bluetooth/btscanner/device.cpp diff --git a/examples/btscanner/device.h b/examples/bluetooth/btscanner/device.h index af2d9a7f..af2d9a7f 100644 --- a/examples/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h diff --git a/examples/btscanner/device.ui b/examples/bluetooth/btscanner/device.ui index 1f62dd96..1f62dd96 100644 --- a/examples/btscanner/device.ui +++ b/examples/bluetooth/btscanner/device.ui diff --git a/examples/bluetooth/btscanner/doc/images/btscanner-example.png b/examples/bluetooth/btscanner/doc/images/btscanner-example.png Binary files differnew file mode 100644 index 00000000..04fe9f3c --- /dev/null +++ b/examples/bluetooth/btscanner/doc/images/btscanner-example.png diff --git a/examples/bluetooth/btscanner/doc/src/btscanner.qdoc b/examples/bluetooth/btscanner/doc/src/btscanner.qdoc new file mode 100644 index 00000000..f5ee3e3a --- /dev/null +++ b/examples/bluetooth/btscanner/doc/src/btscanner.qdoc @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example btscanner + \title Bluetooth Scanner Example + + An example of how to locate Bluetooth devices. + + \image btscanner-example.png + +*/ diff --git a/examples/btscanner/main.cpp b/examples/bluetooth/btscanner/main.cpp index e185ffca..e185ffca 100644 --- a/examples/btscanner/main.cpp +++ b/examples/bluetooth/btscanner/main.cpp diff --git a/examples/btscanner/service.cpp b/examples/bluetooth/btscanner/service.cpp index daadb2b2..daadb2b2 100644 --- a/examples/btscanner/service.cpp +++ b/examples/bluetooth/btscanner/service.cpp diff --git a/examples/btscanner/service.h b/examples/bluetooth/btscanner/service.h index 0e17aa14..0e17aa14 100644 --- a/examples/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h diff --git a/examples/btscanner/service.ui b/examples/bluetooth/btscanner/service.ui index 68ebc5dc..68ebc5dc 100644 --- a/examples/btscanner/service.ui +++ b/examples/bluetooth/btscanner/service.ui diff --git a/examples/bttennis/board.cpp b/examples/bluetooth/bttennis/board.cpp index d1aab939..d1aab939 100644 --- a/examples/bttennis/board.cpp +++ b/examples/bluetooth/bttennis/board.cpp diff --git a/examples/bttennis/board.h b/examples/bluetooth/bttennis/board.h index 7b0f279b..7b0f279b 100644 --- a/examples/bttennis/board.h +++ b/examples/bluetooth/bttennis/board.h diff --git a/examples/bttennis/bttennis.pro b/examples/bluetooth/bttennis/bttennis.pro index 39e33dcf..39e33dcf 100644 --- a/examples/bttennis/bttennis.pro +++ b/examples/bluetooth/bttennis/bttennis.pro diff --git a/examples/bttennis/connect.png b/examples/bluetooth/bttennis/connect.png Binary files differindex 70b64c6c..70b64c6c 100644 --- a/examples/bttennis/connect.png +++ b/examples/bluetooth/bttennis/connect.png diff --git a/examples/bttennis/controller.cpp b/examples/bluetooth/bttennis/controller.cpp index c137060a..c137060a 100644 --- a/examples/bttennis/controller.cpp +++ b/examples/bluetooth/bttennis/controller.cpp diff --git a/examples/bttennis/controller.h b/examples/bluetooth/bttennis/controller.h index 492f094b..492f094b 100644 --- a/examples/bttennis/controller.h +++ b/examples/bluetooth/bttennis/controller.h diff --git a/examples/bluetooth/bttennis/doc/images/bttennis-example.png b/examples/bluetooth/bttennis/doc/images/bttennis-example.png Binary files differnew file mode 100644 index 00000000..53a5486b --- /dev/null +++ b/examples/bluetooth/bttennis/doc/images/bttennis-example.png diff --git a/examples/bluetooth/bttennis/doc/src/bttennis.qdoc b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc new file mode 100644 index 00000000..094dbaa3 --- /dev/null +++ b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example bttennis + \title Bluetooth Tennis Example + + The Bluetooth Tennis example shows how to use the Qt Connectivity Bluetooth API + to implement real-time data transfer for interactive applications. + + \image bttennis-example.png + +*/ diff --git a/examples/bttennis/handover.cpp b/examples/bluetooth/bttennis/handover.cpp index 03ec169b..03ec169b 100644 --- a/examples/bttennis/handover.cpp +++ b/examples/bluetooth/bttennis/handover.cpp diff --git a/examples/bttennis/handover.h b/examples/bluetooth/bttennis/handover.h index 0e932267..0e932267 100644 --- a/examples/bttennis/handover.h +++ b/examples/bluetooth/bttennis/handover.h diff --git a/examples/bttennis/main.cpp b/examples/bluetooth/bttennis/main.cpp index d30632f7..d30632f7 100644 --- a/examples/bttennis/main.cpp +++ b/examples/bluetooth/bttennis/main.cpp diff --git a/examples/bttennis/tennis.cpp b/examples/bluetooth/bttennis/tennis.cpp index 54fe026f..54fe026f 100644 --- a/examples/bttennis/tennis.cpp +++ b/examples/bluetooth/bttennis/tennis.cpp diff --git a/examples/bttennis/tennis.h b/examples/bluetooth/bttennis/tennis.h index 92b5f0fa..92b5f0fa 100644 --- a/examples/bttennis/tennis.h +++ b/examples/bluetooth/bttennis/tennis.h diff --git a/examples/bttennis/tennis.qrc b/examples/bluetooth/bttennis/tennis.qrc index 12aa7464..12aa7464 100644 --- a/examples/bttennis/tennis.qrc +++ b/examples/bluetooth/bttennis/tennis.qrc diff --git a/examples/bttennis/tennis.ui b/examples/bluetooth/bttennis/tennis.ui index d6625fa8..d6625fa8 100644 --- a/examples/bttennis/tennis.ui +++ b/examples/bluetooth/bttennis/tennis.ui diff --git a/examples/bttennis/tennisclient.cpp b/examples/bluetooth/bttennis/tennisclient.cpp index c5487f02..c5487f02 100644 --- a/examples/bttennis/tennisclient.cpp +++ b/examples/bluetooth/bttennis/tennisclient.cpp diff --git a/examples/bttennis/tennisclient.h b/examples/bluetooth/bttennis/tennisclient.h index aeccfca1..aeccfca1 100644 --- a/examples/bttennis/tennisclient.h +++ b/examples/bluetooth/bttennis/tennisclient.h diff --git a/examples/bttennis/tennisserver.cpp b/examples/bluetooth/bttennis/tennisserver.cpp index 21af2975..21af2975 100644 --- a/examples/bttennis/tennisserver.cpp +++ b/examples/bluetooth/bttennis/tennisserver.cpp diff --git a/examples/bttennis/tennisserver.h b/examples/bluetooth/bttennis/tennisserver.h index bfce30ae..bfce30ae 100644 --- a/examples/bttennis/tennisserver.h +++ b/examples/bluetooth/bttennis/tennisserver.h diff --git a/examples/bttennis/tennisview.cpp b/examples/bluetooth/bttennis/tennisview.cpp index 74a43354..74a43354 100644 --- a/examples/bttennis/tennisview.cpp +++ b/examples/bluetooth/bttennis/tennisview.cpp diff --git a/examples/bttennis/tennisview.h b/examples/bluetooth/bttennis/tennisview.h index f6bb767e..f6bb767e 100644 --- a/examples/bttennis/tennisview.h +++ b/examples/bluetooth/bttennis/tennisview.h diff --git a/examples/scanner/qmlscanner.cpp b/examples/bluetooth/scanner/qmlscanner.cpp index b86ed72f..b86ed72f 100644 --- a/examples/scanner/qmlscanner.cpp +++ b/examples/bluetooth/scanner/qmlscanner.cpp diff --git a/examples/scanner/scanner.pro b/examples/bluetooth/scanner/scanner.pro index ff046a96..ff046a96 100644 --- a/examples/scanner/scanner.pro +++ b/examples/bluetooth/scanner/scanner.pro diff --git a/examples/scanner/scanner.qml b/examples/bluetooth/scanner/scanner.qml index e83b0a03..e83b0a03 100644 --- a/examples/scanner/scanner.qml +++ b/examples/bluetooth/scanner/scanner.qml diff --git a/examples/scanner/scanner.qrc b/examples/bluetooth/scanner/scanner.qrc index 93e9ce08..93e9ce08 100644 --- a/examples/scanner/scanner.qrc +++ b/examples/bluetooth/scanner/scanner.qrc diff --git a/examples/examples.pro b/examples/examples.pro index c40706b5..36b1ecb5 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,12 +1,9 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-widgets) { - SUBDIRS += btchat \ - btscanner \ - btfiletransfer \ - bttennis + SUBDIRS += bluetooth } -SUBDIRS += scanner +SUBDIRS += bluetooth #Qt NFC based examples #SUBDIRS += poster \ diff --git a/examples/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp index f13f3235..f13f3235 100644 --- a/examples/annotatedurl/annotatedurl.cpp +++ b/examples/nfc/annotatedurl/annotatedurl.cpp diff --git a/examples/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h index 490539a2..490539a2 100644 --- a/examples/annotatedurl/annotatedurl.h +++ b/examples/nfc/annotatedurl/annotatedurl.h diff --git a/examples/annotatedurl/annotatedurl.pro b/examples/nfc/annotatedurl/annotatedurl.pro index 65ed7c8d..65ed7c8d 100644 --- a/examples/annotatedurl/annotatedurl.pro +++ b/examples/nfc/annotatedurl/annotatedurl.pro diff --git a/examples/nfc/annotatedurl/doc/images/annotatedurl.png b/examples/nfc/annotatedurl/doc/images/annotatedurl.png Binary files differnew file mode 100644 index 00000000..71739f50 --- /dev/null +++ b/examples/nfc/annotatedurl/doc/images/annotatedurl.png diff --git a/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc new file mode 100644 index 00000000..7aa706b6 --- /dev/null +++ b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! +\example annotatedurl +\title Annotated URL Example + +The Annotated URL example displays the contents of specifically formated NDEF messages read from +an NFC Tag. The NDEF message should contain a URI record, an optional image/* MIME record and one +or more localized Text records. + +\image annotatedurl.png +*/ diff --git a/examples/annotatedurl/main.cpp b/examples/nfc/annotatedurl/main.cpp index 65be03c5..65be03c5 100644 --- a/examples/annotatedurl/main.cpp +++ b/examples/nfc/annotatedurl/main.cpp diff --git a/examples/annotatedurl/mainwindow.cpp b/examples/nfc/annotatedurl/mainwindow.cpp index 7045a5dc..7045a5dc 100644 --- a/examples/annotatedurl/mainwindow.cpp +++ b/examples/nfc/annotatedurl/mainwindow.cpp diff --git a/examples/annotatedurl/mainwindow.h b/examples/nfc/annotatedurl/mainwindow.h index 0786f8aa..0786f8aa 100644 --- a/examples/annotatedurl/mainwindow.h +++ b/examples/nfc/annotatedurl/mainwindow.h diff --git a/examples/annotatedurl/mainwindow.ui b/examples/nfc/annotatedurl/mainwindow.ui index 26e3b302..26e3b302 100644 --- a/examples/annotatedurl/mainwindow.ui +++ b/examples/nfc/annotatedurl/mainwindow.ui diff --git a/examples/nfc/ndefeditor/doc/images/ndefeditor.png b/examples/nfc/ndefeditor/doc/images/ndefeditor.png Binary files differnew file mode 100644 index 00000000..0334dadf --- /dev/null +++ b/examples/nfc/ndefeditor/doc/images/ndefeditor.png diff --git a/examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc b/examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc new file mode 100644 index 00000000..c2f1fcaf --- /dev/null +++ b/examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! +\example ndefeditor +\title NDEF Editor Example + +The NDEF Editor example reads and writes NDEF messages to NFC Forum Tags. NDEF messages can be +composed by adding records of supported types. + +\image ndefeditor.png +*/ diff --git a/examples/ndefeditor/main.cpp b/examples/nfc/ndefeditor/main.cpp index 800b6cd3..800b6cd3 100644 --- a/examples/ndefeditor/main.cpp +++ b/examples/nfc/ndefeditor/main.cpp diff --git a/examples/ndefeditor/mainwindow.cpp b/examples/nfc/ndefeditor/mainwindow.cpp index e847416b..e847416b 100644 --- a/examples/ndefeditor/mainwindow.cpp +++ b/examples/nfc/ndefeditor/mainwindow.cpp diff --git a/examples/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h index 6be6be25..6be6be25 100644 --- a/examples/ndefeditor/mainwindow.h +++ b/examples/nfc/ndefeditor/mainwindow.h diff --git a/examples/ndefeditor/mainwindow.ui b/examples/nfc/ndefeditor/mainwindow.ui index adffa331..adffa331 100644 --- a/examples/ndefeditor/mainwindow.ui +++ b/examples/nfc/ndefeditor/mainwindow.ui diff --git a/examples/ndefeditor/mimeimagerecordeditor.cpp b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp index beb1bb41..beb1bb41 100644 --- a/examples/ndefeditor/mimeimagerecordeditor.cpp +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp diff --git a/examples/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h index 62330f2f..62330f2f 100644 --- a/examples/ndefeditor/mimeimagerecordeditor.h +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h diff --git a/examples/ndefeditor/mimeimagerecordeditor.ui b/examples/nfc/ndefeditor/mimeimagerecordeditor.ui index 4cde216f..4cde216f 100644 --- a/examples/ndefeditor/mimeimagerecordeditor.ui +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.ui diff --git a/examples/ndefeditor/ndefeditor.pro b/examples/nfc/ndefeditor/ndefeditor.pro index 47971fdb..47971fdb 100644 --- a/examples/ndefeditor/ndefeditor.pro +++ b/examples/nfc/ndefeditor/ndefeditor.pro diff --git a/examples/ndefeditor/textrecord.ui b/examples/nfc/ndefeditor/textrecord.ui index eedd2d83..eedd2d83 100644 --- a/examples/ndefeditor/textrecord.ui +++ b/examples/nfc/ndefeditor/textrecord.ui diff --git a/examples/ndefeditor/textrecordeditor.cpp b/examples/nfc/ndefeditor/textrecordeditor.cpp index 9b82476a..9b82476a 100644 --- a/examples/ndefeditor/textrecordeditor.cpp +++ b/examples/nfc/ndefeditor/textrecordeditor.cpp diff --git a/examples/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h index f692d0b7..f692d0b7 100644 --- a/examples/ndefeditor/textrecordeditor.h +++ b/examples/nfc/ndefeditor/textrecordeditor.h diff --git a/examples/ndefeditor/textrecordeditor.ui b/examples/nfc/ndefeditor/textrecordeditor.ui index 41950e7d..41950e7d 100644 --- a/examples/ndefeditor/textrecordeditor.ui +++ b/examples/nfc/ndefeditor/textrecordeditor.ui diff --git a/examples/ndefeditor/urirecordeditor.cpp b/examples/nfc/ndefeditor/urirecordeditor.cpp index 08bf9b47..08bf9b47 100644 --- a/examples/ndefeditor/urirecordeditor.cpp +++ b/examples/nfc/ndefeditor/urirecordeditor.cpp diff --git a/examples/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h index cf7af023..cf7af023 100644 --- a/examples/ndefeditor/urirecordeditor.h +++ b/examples/nfc/ndefeditor/urirecordeditor.h diff --git a/examples/ndefeditor/urirecordeditor.ui b/examples/nfc/ndefeditor/urirecordeditor.ui index 929c1eb4..929c1eb4 100644 --- a/examples/ndefeditor/urirecordeditor.ui +++ b/examples/nfc/ndefeditor/urirecordeditor.ui diff --git a/examples/nfc/poster/doc/images/qml-poster-example.png b/examples/nfc/poster/doc/images/qml-poster-example.png Binary files differnew file mode 100644 index 00000000..ab01a31f --- /dev/null +++ b/examples/nfc/poster/doc/images/qml-poster-example.png diff --git a/examples/nfc/poster/doc/src/poster.qdoc b/examples/nfc/poster/doc/src/poster.qdoc new file mode 100644 index 00000000..109938d2 --- /dev/null +++ b/examples/nfc/poster/doc/src/poster.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt local connectivty modules. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** 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. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! +\example poster +\title QML Poster Example + +The QML Poster example displays the contents of specifically formated NDEF messages read from an +NFC Tag. The NDEF message should contain a URI record, an optional image/* MIME record and one +or more localized Text records. + +\image qml-poster-example.png + +*/ diff --git a/examples/poster/poster.pro b/examples/nfc/poster/poster.pro index de2e1a05..de2e1a05 100644 --- a/examples/poster/poster.pro +++ b/examples/nfc/poster/poster.pro diff --git a/examples/poster/poster.qml b/examples/nfc/poster/poster.qml index 6cd181cd..6cd181cd 100644 --- a/examples/poster/poster.qml +++ b/examples/nfc/poster/poster.qml diff --git a/examples/poster/poster.qrc b/examples/nfc/poster/poster.qrc index d8286e71..d8286e71 100644 --- a/examples/poster/poster.qrc +++ b/examples/nfc/poster/poster.qrc diff --git a/examples/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp index 606a96f8..606a96f8 100644 --- a/examples/poster/qmlposter.cpp +++ b/examples/nfc/poster/qmlposter.cpp |