diff options
Diffstat (limited to 'examples/nfc')
| -rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.cpp | 4 | ||||
| -rw-r--r-- | examples/nfc/corkboard/corkboard.pro | 11 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/textrecord.ui | 21 |
3 files changed, 8 insertions, 28 deletions
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> |