Move bttennis from an example to a demo

22 files changed, 10 insertions, 3 deletions

diff --git a/examples/bttennis/board.cpp b/demos/bttennis/board.cpp
index 8c0297f328..8c0297f328 100644
--- a/examples/bttennis/board.cpp
+++ b/demos/bttennis/board.cpp
diff --git a/examples/bttennis/board.h b/demos/bttennis/board.h
index e54bd690ea..e54bd690ea 100644
--- a/examples/bttennis/board.h
+++ b/demos/bttennis/board.h
diff --git a/examples/bttennis/bttennis.pro b/demos/bttennis/bttennis.pro
index 3e0ff69cf8..353ce3ce7f 100644
--- a/examples/bttennis/bttennis.pro
+++ b/demos/bttennis/bttennis.pro
@@ -8,7 +8,7 @@ DEPENDPATH += \
     ../../src/connectivity/bluetooth \
     ../../src/connectivity/nfc
 
-include(../mobility_examples.pri)
+include(../demos.pri)
 
 CONFIG += mobility
 MOBILITY = connectivity
diff --git a/examples/bttennis/connect.png b/demos/bttennis/connect.png
index 70b64c6cb7..70b64c6cb7 100644
--- a/examples/bttennis/connect.png
+++ b/demos/bttennis/connect.png
diff --git a/examples/bttennis/controller.cpp b/demos/bttennis/controller.cpp
index 342e952288..342e952288 100644
--- a/examples/bttennis/controller.cpp
+++ b/demos/bttennis/controller.cpp
diff --git a/examples/bttennis/controller.h b/demos/bttennis/controller.h
index 4de84d1f7a..4de84d1f7a 100644
--- a/examples/bttennis/controller.h
+++ b/demos/bttennis/controller.h
diff --git a/examples/bttennis/handover.cpp b/demos/bttennis/handover.cpp
index d9ccce1152..d9ccce1152 100644
--- a/examples/bttennis/handover.cpp
+++ b/demos/bttennis/handover.cpp
diff --git a/examples/bttennis/handover.h b/demos/bttennis/handover.h
index a11d1fd889..a11d1fd889 100644
--- a/examples/bttennis/handover.h
+++ b/demos/bttennis/handover.h
diff --git a/examples/bttennis/main.cpp b/demos/bttennis/main.cpp
index 618a191d2c..618a191d2c 100644
--- a/examples/bttennis/main.cpp
+++ b/demos/bttennis/main.cpp
diff --git a/examples/bttennis/tennis.cpp b/demos/bttennis/tennis.cpp
index 30bfc0e25d..30bfc0e25d 100644
--- a/examples/bttennis/tennis.cpp
+++ b/demos/bttennis/tennis.cpp
diff --git a/examples/bttennis/tennis.h b/demos/bttennis/tennis.h
index 79c5b36ce5..79c5b36ce5 100644
--- a/examples/bttennis/tennis.h
+++ b/demos/bttennis/tennis.h
diff --git a/examples/bttennis/tennis.qrc b/demos/bttennis/tennis.qrc
index 12aa74648c..12aa74648c 100644
--- a/examples/bttennis/tennis.qrc
+++ b/demos/bttennis/tennis.qrc
diff --git a/examples/bttennis/tennis.ui b/demos/bttennis/tennis.ui
index d6625fa849..d6625fa849 100644
--- a/examples/bttennis/tennis.ui
+++ b/demos/bttennis/tennis.ui
diff --git a/examples/bttennis/tennisclient.cpp b/demos/bttennis/tennisclient.cpp
index ea04664221..ea04664221 100644
--- a/examples/bttennis/tennisclient.cpp
+++ b/demos/bttennis/tennisclient.cpp
diff --git a/examples/bttennis/tennisclient.h b/demos/bttennis/tennisclient.h
index f297dd2df0..f297dd2df0 100644
--- a/examples/bttennis/tennisclient.h
+++ b/demos/bttennis/tennisclient.h
diff --git a/examples/bttennis/tennisserver.cpp b/demos/bttennis/tennisserver.cpp
index 65cf845063..65cf845063 100644
--- a/examples/bttennis/tennisserver.cpp
+++ b/demos/bttennis/tennisserver.cpp
diff --git a/examples/bttennis/tennisserver.h b/demos/bttennis/tennisserver.h
index 8a4973db6a..8a4973db6a 100644
--- a/examples/bttennis/tennisserver.h
+++ b/demos/bttennis/tennisserver.h
diff --git a/examples/bttennis/tennisview.cpp b/demos/bttennis/tennisview.cpp
index 64f1b9c07e..64f1b9c07e 100644
--- a/examples/bttennis/tennisview.cpp
+++ b/demos/bttennis/tennisview.cpp
diff --git a/examples/bttennis/tennisview.h b/demos/bttennis/tennisview.h
index 93171469d3..93171469d3 100644
--- a/examples/bttennis/tennisview.h
+++ b/demos/bttennis/tennisview.h
diff --git a/demos/demos.pro b/demos/demos.pro
index 1180b1095a..466506742b 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -41,5 +41,13 @@ contains(mobility_modules,contacts) {
     }
 }
 
+# Connectivity
+contains(mobility_modules,connectivity):!win32 {
+    SUBDIRS += \
+        bttennis
+
+}
+
+
 sources.path = $$QT_MOBILITY_DEMOS
 INSTALLS += sources
diff --git a/examples/examples.pro b/examples/examples.pro
index a93e6a8bdd..b1149282b7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -151,7 +151,6 @@ contains(mobility_modules,connectivity):!win32 {
         btchat \
         btfiletransfer \
         btscanner \
-        bttennis \
         ndefeditor
 
     contains(QT_CONFIG, declarative):SUBDIRS += declarative-connectivity
diff --git a/src/harmattaninstalls/libqtm-examples.install b/src/harmattaninstalls/libqtm-examples.install
index dc9ddb19db..c99d29b0c7 100644
--- a/src/harmattaninstalls/libqtm-examples.install
+++ b/src/harmattaninstalls/libqtm-examples.install
@@ -10,6 +10,7 @@ usr/lib/qtmobility/demos/qmlcontacts
 usr/lib/qtmobility/demos/serviceactions
 usr/lib/qtmobility/demos/smallsensors
 usr/lib/qtmobility/demos/weatherinfo_with_location
+usr/lib/qtmobility/demos/bttennis
 usr/lib/qtmobility/examples/accel
 usr/lib/qtmobility/examples/annotatedurl
 usr/lib/qtmobility/examples/arrowkeys
@@ -23,7 +24,6 @@ usr/lib/qtmobility/examples/battery-subscriber/content/bubble.png
 usr/lib/qtmobility/examples/btchat
 usr/lib/qtmobility/examples/btfiletransfer
 usr/lib/qtmobility/examples/btscanner
-usr/lib/qtmobility/examples/bttennis
 usr/lib/qtmobility/examples/calendardemo
 usr/lib/qtmobility/examples/camera
 usr/lib/qtmobility/examples/cubehouse