110 files changed, 93 insertions, 42 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/doc/src/images/btchat-example.png b/examples/bluetooth/btchat/doc/images/btchat-example.png
index 762d49cb..762d49cb 100644
--- a/doc/src/images/btchat-example.png
+++ b/examples/bluetooth/btchat/doc/images/btchat-example.png
diff --git a/doc/src/examples/btchat.qdoc b/examples/bluetooth/btchat/doc/src/btchat.qdoc
index 93d1c6f4..20f1ad93 100644
--- a/doc/src/examples/btchat.qdoc
+++ b/examples/bluetooth/btchat/doc/src/btchat.qdoc
@@ -42,13 +42,13 @@
 
     The chat server is implemented by the ChatServer class.  The ChatServer class is declared as:
 
-    \snippet ../examples/btchat/chatserver.h declaration
+    \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 ../examples/btchat/chatserver.cpp Create the server
+    \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
@@ -61,86 +61,86 @@
     The textural description of the service is stored in the ServiceName, ServiceDescription and
     ServiceProvider attributes.
 
-    \snippet ../examples/btchat/chatserver.cpp Service name, description and provider
+    \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 ../examples/btchat/chatserver.cpp Service UUID
-    \snippet ../examples/btchat/chatserver.cpp Service UUID set
+    \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 ../examples/btchat/chatserver.cpp Service Discoverability
+    \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 ../examples/btchat/chatserver.cpp Protocol descriptor list
+    \snippet btchat/chatserver.cpp Protocol descriptor list
 
     Finally we register the service record with the system.
 
-    \snippet ../examples/btchat/chatserver.cpp Register service
+    \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 ../examples/btchat/chatserver.cpp clientConnected
+    \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 ../examples/btchat/chatserver.cpp readSocket
+    \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 ../examples/btchat/chatserver.cpp clientDisconnected
+    \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 ../examples/btchat/chatserver.cpp sendMessage
+    \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 ../examples/btchat/chatserver.cpp stopServer
+    \snippet btchat/chatserver.cpp stopServer
 
     \section1 Chat Client
 
     The chat client is implemented by the ChatClient class.  The ChatClient class is declared as:
 
-    \snippet ../examples/btchat/chatclient.h declaration
+    \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 ../examples/btchat/chatclient.cpp startClient
+    \snippet btchat/chatclient.cpp startClient
 
     On sucessfull socket connection we emit a signal to notify other.
 
-    \snippet ../examples/btchat/chatclient.cpp connected
+    \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 ../examples/btchat/chatclient.cpp readSocket
+    \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 ../examples/btchat/chatclient.cpp sendMessage
+    \snippet btchat/chatclient.cpp sendMessage
 
     To disconnect from the remote chat service the QBluetoothSocket instance is deleted.
 
-    \snippet ../examples/btchat/chatclient.cpp stopClient
+    \snippet btchat/chatclient.cpp stopClient
 
     \section1 Chat Dialog
 
@@ -148,44 +148,44 @@
     displays a chat session between a single ChatServer and zero or more ChatClients.  The Chat
     class is declared as:
 
-    \snippet ../examples/btchat/chat.h declaration
+    \snippet btchat/chat.h declaration
 
     First we construct the user interface
 
-    \snippet ../examples/btchat/chat.cpp Construct UI
+    \snippet btchat/chat.cpp Construct UI
 
     We create an instance of the ChatServer and respond to its clientConnected(),
     clientDiconnected() and messageReceived() signals.
 
-    \snippet ../examples/btchat/chat.cpp Create Chat Server
+    \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 ../examples/btchat/chat.cpp clientConnected clientDisconnected
+    \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 ../examples/btchat/chat.cpp showMessage
+    \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 ../examples/btchat/chat.cpp Connect to remote service
+    \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 ../examples/btchat/chat.cpp connected
+    \snippet btchat/chat.cpp connected
 
     Messages are sent to all remote devices via the ChatServer and ChatClient instances by emitting
     the sendMessage() signal.
 
-    \snippet ../examples/btchat/chat.cpp sendClicked
+    \snippet btchat/chat.cpp sendClicked
 
     We need to clean up ChatClient instances when the remote device forces a disconnect.
 
-    \snippet ../examples/btchat/chat.cpp clientDisconnected
+    \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
index e192ca89..e192ca89 100644
--- a/examples/btfiletransfer/busy.gif
+++ b/examples/bluetooth/btfiletransfer/busy.gif
diff --git a/doc/src/images/btfiletransfer-example.png b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
index f98241d6..f98241d6 100644
--- a/doc/src/images/btfiletransfer-example.png
+++ b/examples/bluetooth/btfiletransfer/doc/images/btfiletransfer-example.png
diff --git a/doc/src/examples/btfiletransfer.qdoc b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc
index 200b3d6f..200b3d6f 100644
--- a/doc/src/examples/btfiletransfer.qdoc
+++ b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc
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
index 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/doc/src/images/btscanner-example.png b/examples/bluetooth/btscanner/doc/images/btscanner-example.png
index 04fe9f3c..04fe9f3c 100644
--- a/doc/src/images/btscanner-example.png
+++ b/examples/bluetooth/btscanner/doc/images/btscanner-example.png
diff --git a/doc/src/examples/btscanner.qdoc b/examples/bluetooth/btscanner/doc/src/btscanner.qdoc
index f5ee3e3a..f5ee3e3a 100644
--- a/doc/src/examples/btscanner.qdoc
+++ b/examples/bluetooth/btscanner/doc/src/btscanner.qdoc
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
index 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/doc/src/images/bttennis-example.png b/examples/bluetooth/bttennis/doc/images/bttennis-example.png
index 53a5486b..53a5486b 100644
--- a/doc/src/images/bttennis-example.png
+++ b/examples/bluetooth/bttennis/doc/images/bttennis-example.png
diff --git a/doc/src/examples/bttennis.qdoc b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc
index 094dbaa3..094dbaa3 100644
--- a/doc/src/examples/bttennis.qdoc
+++ b/examples/bluetooth/bttennis/doc/src/bttennis.qdoc
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/doc/src/images/annotatedurl.png b/examples/nfc/annotatedurl/doc/images/annotatedurl.png
index 71739f50..71739f50 100644
--- a/doc/src/images/annotatedurl.png
+++ b/examples/nfc/annotatedurl/doc/images/annotatedurl.png
diff --git a/doc/src/examples/annotatedurl.qdoc b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
index 7aa706b6..7aa706b6 100644
--- a/doc/src/examples/annotatedurl.qdoc
+++ b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
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/doc/src/images/ndefeditor.png b/examples/nfc/ndefeditor/doc/images/ndefeditor.png
index 0334dadf..0334dadf 100644
--- a/doc/src/images/ndefeditor.png
+++ b/examples/nfc/ndefeditor/doc/images/ndefeditor.png
diff --git a/doc/src/examples/ndefeditor.qdoc b/examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc
index c2f1fcaf..c2f1fcaf 100644
--- a/doc/src/examples/ndefeditor.qdoc
+++ b/examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc
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/doc/src/images/qml-poster-example.png b/examples/nfc/poster/doc/images/qml-poster-example.png
index ab01a31f..ab01a31f 100644
--- a/doc/src/images/qml-poster-example.png
+++ b/examples/nfc/poster/doc/images/qml-poster-example.png
diff --git a/doc/src/examples/poster.qdoc b/examples/nfc/poster/doc/src/poster.qdoc
index 109938d2..109938d2 100644
--- a/doc/src/examples/poster.qdoc
+++ b/examples/nfc/poster/doc/src/poster.qdoc
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
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf
new file mode 100644
index 00000000..3ee3ffcc
--- /dev/null
+++ b/src/bluetooth/doc/qtbluetooth.qdocconf
@@ -0,0 +1,45 @@
+include(../../../doc/global/qt-html-templates-offline.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
+
+project                 = QtBluetooth
+description             = Qt Bluetooth Reference Documentation
+url                     = http://qt-project.org/doc/qt-5.0/qtbluetooth-index.html
+version                 = 5.0.0
+
+qhp.projects            = QtBluetooth
+
+qhp.QtBluetooth.file                = qtbluetooth.qhp
+qhp.QtBluetooth.namespace           = org.qt-project.qtbluetooth.500
+qhp.QtBluetooth.virtualFolder       = qdoc
+qhp.QtBluetooth.indexTitle          = Qt Bluetooth Reference Documentation
+qhp.QtBluetooth.indexRoot           =
+
+qhp.QtBluetooth.filterAttributes    = qtbluetooth 5.0.0 qtrefdoc
+qhp.QtBluetooth.customFilters.Qt.name = QtBluetooth 5.0.0
+qhp.QtBluetooth.customFilters.Qt.filterAttributes = qtbluetooth 5.0.0
+qhp.QtBluetooth.subprojects         = classes overviews examples
+qhp.QtBluetooth.subprojects.classes.title = Classes
+qhp.QtBluetooth.subprojects.classes.indexTitle = Qt Bluetooth's Classes
+qhp.QtBluetooth.subprojects.classes.selectors = class fake:headerfile
+qhp.QtBluetooth.subprojects.classes.sortPages = true
+qhp.QtBluetooth.subprojects.overviews.title = Overviews
+qhp.QtBluetooth.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtBluetooth.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtBluetooth.subprojects.examples.title = Qt Bluetooth Examples
+qhp.QtBluetooth.subprojects.examples.indexTitle = Qt Bluetooth Examples
+qhp.QtBluetooth.subprojects.examples.selectors = fake:example
+
+outputdir               = ../../../doc/qtbluetooth
+tagfile                 = ../../../doc/qtbluetooth/qtbluetooth.tags
+
+headerdirs  += .. \
+                ../../imports/bluetooth
+
+sourcedirs  += .. \
+                ../../imports/bluetooth \
+
+exampledirs += ../../../examples/bluetooth \
+               snippets/
+
+
+imagedirs   += images
diff --git a/doc/src/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
index c06bc4b4..c06bc4b4 100644
--- a/doc/src/snippets/doc_src_qtbluetooth.cpp
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
diff --git a/doc/src/snippets/doc_src_qtbluetooth.pro b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.pro
index 175830ea..175830ea 100644
--- a/doc/src/snippets/doc_src_qtbluetooth.pro
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.pro
diff --git a/doc/src/snippets/doc_src_qtbluetooth.qml b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml
index dd295d49..dd295d49 100644
--- a/doc/src/snippets/doc_src_qtbluetooth.qml
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.qml
diff --git a/doc/src/bluetooth-cpp.qdoc b/src/bluetooth/doc/src/bluetooth-cpp.qdoc
index 4dcb6021..4dcb6021 100644
--- a/doc/src/bluetooth-cpp.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-cpp.qdoc
diff --git a/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index b9b62aea..371de05c 100644
--- a/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -43,12 +43,12 @@
     To use the C++ library in your application, add the following configuration
     option to your \c .pro file:
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.pro contacts project modification
+    \snippet doc_src_qtbluetooth.pro contacts project modification
 
     To use the classes of the module in your application you need the following
     import statement in your \c .qml file:
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.qml import
+    \snippet doc_src_qtbluetooth.qml import
 
     \section1 References
 
diff --git a/doc/src/bluetooth-overview.qdoc b/src/bluetooth/doc/src/bluetooth-overview.qdoc
index d4071e9f..d62321f7 100644
--- a/doc/src/bluetooth-overview.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-overview.qdoc
@@ -54,7 +54,7 @@
     QBluetoothLocalDevice is the one to provide all of this information. Additionally you can use it
     to turn Bluetooth on and off and set the visibility on the device.
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.cpp turningon
+    \snippet doc_src_qtbluetooth.cpp turningon
 
     \section1 Scanning for Bluetooth Devices
 
@@ -63,7 +63,7 @@
     your own and fill them with data, the easier way is to use the QBluetoothDeviceDiscoveryAgent to
     start an automated search for visible Bluetooth devices within the connectable range.
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.cpp discovery
+    \snippet doc_src_qtbluetooth.cpp discovery
 
     \section1 Pushing Files to Remote Devices
 
@@ -75,7 +75,7 @@
     QBluetoothTransferRequest and ask the QBluetoothTransferManager to push the file contained in
     the request by calling the put() function.
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.cpp sendfile
+    \snippet doc_src_qtbluetooth.cpp sendfile
 
     \section1 Exchanging Data Between Devices
 
@@ -87,12 +87,12 @@
     To be able to create SPP connections, you need to register a Server one one device by using
     QRfcommServer.
 
-    \snippet ../examples/btchat/chatserver.cpp Create the server
+    \snippet chatserver.cpp Create the server
 
     Connect to this server from another device playing the client role by using a
     QBluetoothSocket.
 
-    \snippet ../examples/btchat/chatclient.cpp startClient
+    \snippet chatclient.cpp startClient
 
     Using such a connection allows to exchange any form of data in both directions.
     It is perfectly suited for use cases like gaming or syncing the state between two instances of
diff --git a/doc/src/bluetooth-qml.qdoc b/src/bluetooth/doc/src/bluetooth-qml.qdoc
index 36c4d4fd..36c4d4fd 100644
--- a/doc/src/bluetooth-qml.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-qml.qdoc
diff --git a/doc/src/examples.qdoc b/src/bluetooth/doc/src/examples.qdoc
index da6503c9..da6503c9 100644
--- a/doc/src/examples.qdoc
+++ b/src/bluetooth/doc/src/examples.qdoc
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
index ceff9ea1..7de1c6b6 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -58,7 +58,7 @@ QTBLUETOOTH_BEGIN_NAMESPACE
     \li and call start().
     \endlist
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.cpp discovery
+    \snippet doc_src_qtbluetooth.cpp discovery
 
     To retrieve results asynchronously, connect to the deviceDiscovered() signal. To get a list of
     all discovered devices, call discoveredDevices() after the finished() signal.
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index 51a7eaa9..c5b359bc 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -60,7 +60,7 @@ QTBLUETOOTH_BEGIN_NAMESPACE
     \li and call start().
     \endlist
 
-    \snippet ../doc/src/snippets/doc_src_qtbluetooth.cpp discovery
+    \snippet doc_src_qtbluetooth.cpp discovery
 
     By default a minimal service discovery is performed. In this mode, the QBluetotohServiceInfo
     objects returned are guaranteed to contain only device and service UUID information. Depending