summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorØystein Heskestad <oystein.heskestad@qt.io>2023-09-27 15:14:38 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-11 22:54:04 +0000
commit9eddc6bb1bd6c352e562bf027cbe38b9dcc35aaf (patch)
treef5afcdb65a2de7aadb16027a839387f48b441ce6
parentb3cb88591963240eaf3098e61804fb818c44d7ca (diff)
Move bluetooth examples to tests/manual/examples
These examples are more related to bluetooth than remote objects, and are out or date because they don't use the permission API. Task-number: QTBUG-112850 Change-Id: Ic3059a8cf7a03583cc525db7c8021dd5b607115a Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit fdc8f50466f0c8d04e954123a405047435e83517) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5aec3a34d83ae8575d59478974f8a1ccc0c403ae)
-rw-r--r--examples/remoteobjects/CMakeLists.txt3
-rw-r--r--examples/remoteobjects/remoteobjects.pro1
-rw-r--r--tests/manual/examples/CMakeLists.txt3
-rw-r--r--tests/manual/examples/ble/CMakeLists.txt (renamed from examples/remoteobjects/ble/CMakeLists.txt)0
-rw-r--r--tests/manual/examples/ble/ble.pro (renamed from examples/remoteobjects/ble/ble.pro)0
-rw-r--r--tests/manual/examples/ble/bleclient/CMakeLists.txt (renamed from examples/remoteobjects/ble/bleclient/CMakeLists.txt)0
-rw-r--r--tests/manual/examples/ble/bleclient/bleclient.pro (renamed from examples/remoteobjects/ble/bleclient/bleclient.pro)0
-rw-r--r--tests/manual/examples/ble/bleclient/connectpage.cpp (renamed from examples/remoteobjects/ble/bleclient/connectpage.cpp)0
-rw-r--r--tests/manual/examples/ble/bleclient/connectpage.h (renamed from examples/remoteobjects/ble/bleclient/connectpage.h)0
-rw-r--r--tests/manual/examples/ble/bleclient/connectpage.ui (renamed from examples/remoteobjects/ble/bleclient/connectpage.ui)0
-rw-r--r--tests/manual/examples/ble/bleclient/heaterview.cpp (renamed from examples/remoteobjects/ble/bleclient/heaterview.cpp)0
-rw-r--r--tests/manual/examples/ble/bleclient/heaterview.h (renamed from examples/remoteobjects/ble/bleclient/heaterview.h)0
-rw-r--r--tests/manual/examples/ble/bleclient/heaterview.ui (renamed from examples/remoteobjects/ble/bleclient/heaterview.ui)0
-rw-r--r--tests/manual/examples/ble/bleclient/main.cpp (renamed from examples/remoteobjects/ble/bleclient/main.cpp)0
-rw-r--r--tests/manual/examples/ble/bleclient/mainwindow.cpp (renamed from examples/remoteobjects/ble/bleclient/mainwindow.cpp)0
-rw-r--r--tests/manual/examples/ble/bleclient/mainwindow.h (renamed from examples/remoteobjects/ble/bleclient/mainwindow.h)0
-rw-r--r--tests/manual/examples/ble/bleserver/CMakeLists.txt (renamed from examples/remoteobjects/ble/bleserver/CMakeLists.txt)0
-rw-r--r--tests/manual/examples/ble/bleserver/bleserver.pro (renamed from examples/remoteobjects/ble/bleserver/bleserver.pro)0
-rw-r--r--tests/manual/examples/ble/bleserver/main.cpp (renamed from examples/remoteobjects/ble/bleserver/main.cpp)0
-rw-r--r--tests/manual/examples/ble/common/Info.cmake.macos.plist (renamed from examples/remoteobjects/ble/common/Info.cmake.macos.plist)0
-rw-r--r--tests/manual/examples/ble/common/Info.ios.plist (renamed from examples/remoteobjects/ble/common/Info.ios.plist)0
-rw-r--r--tests/manual/examples/ble/common/Info.qmake.macos.plist (renamed from examples/remoteobjects/ble/common/Info.qmake.macos.plist)0
-rw-r--r--tests/manual/examples/ble/common/bleiodevice.cpp (renamed from examples/remoteobjects/ble/common/bleiodevice.cpp)0
-rw-r--r--tests/manual/examples/ble/common/bleiodevice.h (renamed from examples/remoteobjects/ble/common/bleiodevice.h)0
-rw-r--r--tests/manual/examples/ble/common/common.pri (renamed from examples/remoteobjects/ble/common/common.pri)0
-rw-r--r--tests/manual/examples/ble/common/heater.rep (renamed from examples/remoteobjects/ble/common/heater.rep)0
-rw-r--r--tests/manual/examples/ble/doc/src/ble.qdoc (renamed from examples/remoteobjects/ble/doc/src/ble.qdoc)0
27 files changed, 3 insertions, 4 deletions
diff --git a/examples/remoteobjects/CMakeLists.txt b/examples/remoteobjects/CMakeLists.txt
index 0e34de2..ac6f748 100644
--- a/examples/remoteobjects/CMakeLists.txt
+++ b/examples/remoteobjects/CMakeLists.txt
@@ -9,9 +9,6 @@ add_subdirectory(websockets)
if(TARGET Qt::Widgets)
qt_internal_add_example(modelviewclient)
qt_internal_add_example(modelviewserver)
-if(TARGET Qt::Bluetooth)
- add_subdirectory(ble)
-endif()
endif()
if(QT_FEATURE_ssl)
add_subdirectory(ssl)
diff --git a/examples/remoteobjects/remoteobjects.pro b/examples/remoteobjects/remoteobjects.pro
index 1a43a3a..d8240d2 100644
--- a/examples/remoteobjects/remoteobjects.pro
+++ b/examples/remoteobjects/remoteobjects.pro
@@ -9,7 +9,6 @@ qtHaveModule(widgets) {
SUBDIRS += \
modelviewclient \
modelviewserver
- qtHaveModule(bluetooth): SUBDIRS += ble
}
contains(QT_CONFIG, ssl): SUBDIRS += ssl
diff --git a/tests/manual/examples/CMakeLists.txt b/tests/manual/examples/CMakeLists.txt
index 011d163..1418055 100644
--- a/tests/manual/examples/CMakeLists.txt
+++ b/tests/manual/examples/CMakeLists.txt
@@ -5,3 +5,6 @@ if(TARGET Qt::Quick AND UNIX AND NOT ANDROID)
add_subdirectory(qmlmodelviewclient)
endif()
add_subdirectory(simpleswitch)
+if(TARGET Qt::Bluetooth AND TARGET Qt::Widgets)
+ add_subdirectory(ble)
+endif()
diff --git a/examples/remoteobjects/ble/CMakeLists.txt b/tests/manual/examples/ble/CMakeLists.txt
index 52adc96..52adc96 100644
--- a/examples/remoteobjects/ble/CMakeLists.txt
+++ b/tests/manual/examples/ble/CMakeLists.txt
diff --git a/examples/remoteobjects/ble/ble.pro b/tests/manual/examples/ble/ble.pro
index 341681f..341681f 100644
--- a/examples/remoteobjects/ble/ble.pro
+++ b/tests/manual/examples/ble/ble.pro
diff --git a/examples/remoteobjects/ble/bleclient/CMakeLists.txt b/tests/manual/examples/ble/bleclient/CMakeLists.txt
index adef48b..adef48b 100644
--- a/examples/remoteobjects/ble/bleclient/CMakeLists.txt
+++ b/tests/manual/examples/ble/bleclient/CMakeLists.txt
diff --git a/examples/remoteobjects/ble/bleclient/bleclient.pro b/tests/manual/examples/ble/bleclient/bleclient.pro
index 327ec20..327ec20 100644
--- a/examples/remoteobjects/ble/bleclient/bleclient.pro
+++ b/tests/manual/examples/ble/bleclient/bleclient.pro
diff --git a/examples/remoteobjects/ble/bleclient/connectpage.cpp b/tests/manual/examples/ble/bleclient/connectpage.cpp
index 78ea1b7..78ea1b7 100644
--- a/examples/remoteobjects/ble/bleclient/connectpage.cpp
+++ b/tests/manual/examples/ble/bleclient/connectpage.cpp
diff --git a/examples/remoteobjects/ble/bleclient/connectpage.h b/tests/manual/examples/ble/bleclient/connectpage.h
index c189dd8..c189dd8 100644
--- a/examples/remoteobjects/ble/bleclient/connectpage.h
+++ b/tests/manual/examples/ble/bleclient/connectpage.h
diff --git a/examples/remoteobjects/ble/bleclient/connectpage.ui b/tests/manual/examples/ble/bleclient/connectpage.ui
index 1b4de58..1b4de58 100644
--- a/examples/remoteobjects/ble/bleclient/connectpage.ui
+++ b/tests/manual/examples/ble/bleclient/connectpage.ui
diff --git a/examples/remoteobjects/ble/bleclient/heaterview.cpp b/tests/manual/examples/ble/bleclient/heaterview.cpp
index c6991fe..c6991fe 100644
--- a/examples/remoteobjects/ble/bleclient/heaterview.cpp
+++ b/tests/manual/examples/ble/bleclient/heaterview.cpp
diff --git a/examples/remoteobjects/ble/bleclient/heaterview.h b/tests/manual/examples/ble/bleclient/heaterview.h
index b67c249..b67c249 100644
--- a/examples/remoteobjects/ble/bleclient/heaterview.h
+++ b/tests/manual/examples/ble/bleclient/heaterview.h
diff --git a/examples/remoteobjects/ble/bleclient/heaterview.ui b/tests/manual/examples/ble/bleclient/heaterview.ui
index 875043a..875043a 100644
--- a/examples/remoteobjects/ble/bleclient/heaterview.ui
+++ b/tests/manual/examples/ble/bleclient/heaterview.ui
diff --git a/examples/remoteobjects/ble/bleclient/main.cpp b/tests/manual/examples/ble/bleclient/main.cpp
index bbc2d56..bbc2d56 100644
--- a/examples/remoteobjects/ble/bleclient/main.cpp
+++ b/tests/manual/examples/ble/bleclient/main.cpp
diff --git a/examples/remoteobjects/ble/bleclient/mainwindow.cpp b/tests/manual/examples/ble/bleclient/mainwindow.cpp
index f0af85e..f0af85e 100644
--- a/examples/remoteobjects/ble/bleclient/mainwindow.cpp
+++ b/tests/manual/examples/ble/bleclient/mainwindow.cpp
diff --git a/examples/remoteobjects/ble/bleclient/mainwindow.h b/tests/manual/examples/ble/bleclient/mainwindow.h
index 39e22c2..39e22c2 100644
--- a/examples/remoteobjects/ble/bleclient/mainwindow.h
+++ b/tests/manual/examples/ble/bleclient/mainwindow.h
diff --git a/examples/remoteobjects/ble/bleserver/CMakeLists.txt b/tests/manual/examples/ble/bleserver/CMakeLists.txt
index c5c676a..c5c676a 100644
--- a/examples/remoteobjects/ble/bleserver/CMakeLists.txt
+++ b/tests/manual/examples/ble/bleserver/CMakeLists.txt
diff --git a/examples/remoteobjects/ble/bleserver/bleserver.pro b/tests/manual/examples/ble/bleserver/bleserver.pro
index 9b35365..9b35365 100644
--- a/examples/remoteobjects/ble/bleserver/bleserver.pro
+++ b/tests/manual/examples/ble/bleserver/bleserver.pro
diff --git a/examples/remoteobjects/ble/bleserver/main.cpp b/tests/manual/examples/ble/bleserver/main.cpp
index 0e0904b..0e0904b 100644
--- a/examples/remoteobjects/ble/bleserver/main.cpp
+++ b/tests/manual/examples/ble/bleserver/main.cpp
diff --git a/examples/remoteobjects/ble/common/Info.cmake.macos.plist b/tests/manual/examples/ble/common/Info.cmake.macos.plist
index 114f926..114f926 100644
--- a/examples/remoteobjects/ble/common/Info.cmake.macos.plist
+++ b/tests/manual/examples/ble/common/Info.cmake.macos.plist
diff --git a/examples/remoteobjects/ble/common/Info.ios.plist b/tests/manual/examples/ble/common/Info.ios.plist
index 113e112..113e112 100644
--- a/examples/remoteobjects/ble/common/Info.ios.plist
+++ b/tests/manual/examples/ble/common/Info.ios.plist
diff --git a/examples/remoteobjects/ble/common/Info.qmake.macos.plist b/tests/manual/examples/ble/common/Info.qmake.macos.plist
index efd3b9c..efd3b9c 100644
--- a/examples/remoteobjects/ble/common/Info.qmake.macos.plist
+++ b/tests/manual/examples/ble/common/Info.qmake.macos.plist
diff --git a/examples/remoteobjects/ble/common/bleiodevice.cpp b/tests/manual/examples/ble/common/bleiodevice.cpp
index f957495..f957495 100644
--- a/examples/remoteobjects/ble/common/bleiodevice.cpp
+++ b/tests/manual/examples/ble/common/bleiodevice.cpp
diff --git a/examples/remoteobjects/ble/common/bleiodevice.h b/tests/manual/examples/ble/common/bleiodevice.h
index 359913a..359913a 100644
--- a/examples/remoteobjects/ble/common/bleiodevice.h
+++ b/tests/manual/examples/ble/common/bleiodevice.h
diff --git a/examples/remoteobjects/ble/common/common.pri b/tests/manual/examples/ble/common/common.pri
index ff90ae2..ff90ae2 100644
--- a/examples/remoteobjects/ble/common/common.pri
+++ b/tests/manual/examples/ble/common/common.pri
diff --git a/examples/remoteobjects/ble/common/heater.rep b/tests/manual/examples/ble/common/heater.rep
index 6c5022b..6c5022b 100644
--- a/examples/remoteobjects/ble/common/heater.rep
+++ b/tests/manual/examples/ble/common/heater.rep
diff --git a/examples/remoteobjects/ble/doc/src/ble.qdoc b/tests/manual/examples/ble/doc/src/ble.qdoc
index 44e82bc..44e82bc 100644
--- a/examples/remoteobjects/ble/doc/src/ble.qdoc
+++ b/tests/manual/examples/ble/doc/src/ble.qdoc