summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/bluetooth/chat/chat.pro3
-rw-r--r--examples/bluetooth/picturetransfer/picturetransfer.pro5
-rw-r--r--examples/nfc/annotatedurl/annotatedurl.cpp4
-rw-r--r--examples/nfc/corkboard/corkboard.pro11
-rw-r--r--examples/nfc/ndefeditor/textrecord.ui21
5 files changed, 15 insertions, 29 deletions
diff --git a/examples/bluetooth/chat/chat.pro b/examples/bluetooth/chat/chat.pro
index 5cf6ab9f..7bc5c8bd 100644
--- a/examples/bluetooth/chat/chat.pro
+++ b/examples/bluetooth/chat/chat.pro
@@ -14,3 +14,6 @@ OTHER_FILES += \
Button.qml
#DEFINES += QMLJSDEBUGGER
+
+target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/chat
+INSTALLS += target
diff --git a/examples/bluetooth/picturetransfer/picturetransfer.pro b/examples/bluetooth/picturetransfer/picturetransfer.pro
index 0eee46a2..077673e9 100644
--- a/examples/bluetooth/picturetransfer/picturetransfer.pro
+++ b/examples/bluetooth/picturetransfer/picturetransfer.pro
@@ -21,5 +21,8 @@ SOURCES += \
filetransfer.cpp \
main.cpp
+target.path = $$[QT_INSTALL_EXAMPLES]/bluetooth/picturetransfer
+INSTALLS += target
-
+EXAMPLE_FILES += \
+ icon.png
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp
index cf7dd17a..a07aadcc 100644
--- a/examples/nfc/annotatedurl/annotatedurl.cpp
+++ b/examples/nfc/annotatedurl/annotatedurl.cpp
@@ -77,8 +77,8 @@ AnnotatedUrl::AnnotatedUrl(QObject *parent)
SLOT(handleMessage(QNdefMessage,QNearFieldTarget*)));
//! [QNearFieldManager register handler]
- if (result != -1)
- return;
+ if (result < 0)
+ qWarning() << "Platform does not support NDEF message handler registration";
manager->startTargetDetection();
connect(manager, SIGNAL(targetDetected(QNearFieldTarget*)),
diff --git a/examples/nfc/corkboard/corkboard.pro b/examples/nfc/corkboard/corkboard.pro
index 93142568..9d1de4b3 100644
--- a/examples/nfc/corkboard/corkboard.pro
+++ b/examples/nfc/corkboard/corkboard.pro
@@ -13,9 +13,10 @@ OTHER_FILES += \
corkboards.qml \
Mode.qml
-android {
-OTHER_FILES += \
- android/AndroidManifest.xml
-
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-}
+
+target.path = $$[QT_INSTALL_EXAMPLES]/nfc/corkboard
+INSTALLS += target
+
+EXAMPLE_FILES += \
+ icon.png
diff --git a/examples/nfc/ndefeditor/textrecord.ui b/examples/nfc/ndefeditor/textrecord.ui
deleted file mode 100644
index eedd2d83..00000000
--- a/examples/nfc/ndefeditor/textrecord.ui
+++ /dev/null
@@ -1,21 +0,0 @@
-<ui version="4.0">
- <author/>
- <comment/>
- <exportmacro/>
- <class>TextRecord</class>
- <widget class="QWidget" name="TextRecord">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- </widget>
- <pixmapfunction/>
- <connections/>
-</ui>