diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-09 09:17:51 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-09 09:17:51 +0200 |
commit | 782c57a29fa03d795d96854daf51b8b9e523c933 (patch) | |
tree | 358520baf63a4bd8e7be441269c2fa4ead44dc65 /examples | |
parent | 720118ea73431a0808f0c60dfec10f16fd85af7f (diff) | |
parent | 3f3d1289cc2f30b8fbc0837bf8fb7c767492e4e2 (diff) |
Merge QtNfc on Android into dev/Qt 5.6
Change-Id: I18f2d2d75064dffc4f21c2a7034bb63fcc5008e6
Diffstat (limited to 'examples')
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.cpp | 3 | ||||
-rw-r--r-- | examples/nfc/corkboard/android/AndroidManifest.xml | 61 | ||||
-rw-r--r-- | examples/nfc/corkboard/corkboard.pro | 7 | ||||
-rw-r--r-- | examples/nfc/poster/poster.qml | 5 |
4 files changed, 74 insertions, 2 deletions
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp index cd35c4ef..cf7dd17a 100644 --- a/examples/nfc/annotatedurl/annotatedurl.cpp +++ b/examples/nfc/annotatedurl/annotatedurl.cpp @@ -70,6 +70,9 @@ AnnotatedUrl::AnnotatedUrl(QObject *parent) filter.setOrderMatch(false); filter.appendRecord<QNdefNfcTextRecord>(1, UINT_MAX); filter.appendRecord<QNdefNfcUriRecord>(); + // type parameter cannot specify substring so filter for "image/" below + filter.appendRecord(QNdefRecord::Mime, QByteArray(), 0, 1); + int result = manager->registerNdefMessageHandler(filter, this, SLOT(handleMessage(QNdefMessage,QNearFieldTarget*))); //! [QNearFieldManager register handler] diff --git a/examples/nfc/corkboard/android/AndroidManifest.xml b/examples/nfc/corkboard/android/AndroidManifest.xml new file mode 100644 index 00000000..e921e2b1 --- /dev/null +++ b/examples/nfc/corkboard/android/AndroidManifest.xml @@ -0,0 +1,61 @@ +<?xml version="1.0"?> +<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> + <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --"> + <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + <intent-filter> + <action android:name="android.nfc.action.NDEF_DISCOVERED"/> + <category android:name="android.intent.category.DEFAULT"/> + <data android:mimeType="text/plain"/> + </intent-filter> + <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> + <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> + <meta-data android:name="android.app.repository" android:value="default"/> + <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> + <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> + <!-- Deploy Qt libs as part of package --> + <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> + <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/> + <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/> + <!-- Run with local libs --> + <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/> + <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> + <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/> + <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/> + <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/> + <!-- Messages maps --> + <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> + <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> + <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> + <!-- Messages maps --> + + <!-- Splash screen --> + <!-- + <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/> + --> + <!-- Splash screen --> + + <!-- Background running --> + <!-- Warning: changing this value to true may cause unexpected crashes if the + application still try to draw after + "applicationStateChanged(Qt::ApplicationSuspended)" + signal is sent! --> + <meta-data android:name="android.app.background_running" android:value="false"/> + <!-- Background running --> + </activity> + </application> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> + + <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. + Remove the comment if you do not require these default permissions. --> + <!-- %%INSERT_PERMISSIONS --> + + <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. + Remove the comment if you do not require these default features. --> + <!-- %%INSERT_FEATURES --> + +</manifest> diff --git a/examples/nfc/corkboard/corkboard.pro b/examples/nfc/corkboard/corkboard.pro index d6247032..8c9b05b2 100644 --- a/examples/nfc/corkboard/corkboard.pro +++ b/examples/nfc/corkboard/corkboard.pro @@ -12,3 +12,10 @@ RESOURCES += \ OTHER_FILES += \ corkboards.qml \ Mode.qml + +android:!android-no-sdk { +OTHER_FILES += \ + android/AndroidManifest.xml + +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +} diff --git a/examples/nfc/poster/poster.qml b/examples/nfc/poster/poster.qml index 89e6af19..a70a998b 100644 --- a/examples/nfc/poster/poster.qml +++ b/examples/nfc/poster/poster.qml @@ -63,8 +63,9 @@ Rectangle { } filter: [ - NdefFilter { type: "U"; typeNameFormat: NdefRecord.NfcRtd; minimum: 1; maximum: 1 }, - NdefFilter { type: "T"; typeNameFormat: NdefRecord.NfcRtd; minimum: 1 } + NdefFilter { type: "U"; typeNameFormat: NdefRecord.NfcRtd; maximum: 1 }, + NdefFilter { type: "T"; typeNameFormat: NdefRecord.NfcRtd }, + NdefFilter { typeNameFormat: NdefRecord.Mime; minimum: 0; maximum: 1 } ] onMessageRecordsChanged: { |