diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/nfc/corkboard/android/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | src/tools/sdpscanner/main.cpp | 10 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 33171164..22740a86 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 diff --git a/examples/nfc/corkboard/android/AndroidManifest.xml b/examples/nfc/corkboard/android/AndroidManifest.xml index 3aec51ae..b8222182 100644 --- a/examples/nfc/corkboard/android/AndroidManifest.xml +++ b/examples/nfc/corkboard/android/AndroidManifest.xml @@ -1,11 +1,12 @@ <?xml version='1.0' encoding='utf-8'?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto" android:extractNativeLibs="true"> - <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --"> + <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:allowBackup="true" android:fullBackupOnly="false"> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" - android:launchMode="singleTop"> + android:launchMode="singleTop" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> diff --git a/src/tools/sdpscanner/main.cpp b/src/tools/sdpscanner/main.cpp index 690f9aaa..c39ff8f3 100644 --- a/src/tools/sdpscanner/main.cpp +++ b/src/tools/sdpscanner/main.cpp @@ -39,6 +39,7 @@ #include <QtCore/QByteArray> #include <QtCore/QDebug> +#include <QtCore/QUrl> #include <stdio.h> #include <string> #include <bluetooth/bluetooth.h> @@ -213,10 +214,17 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray & case SDP_URL_STR8: case SDP_URL_STR16: case SDP_URL_STR32: + { xmlOutput.append("<url value=\""); - xmlOutput.append(data->val.str, qstrnlen(data->val.str, data->unitSize)); + const QByteArray urlData = + QByteArray::fromRawData(data->val.str, qstrnlen(data->val.str, data->unitSize)); + const QUrl url = QUrl::fromEncoded(urlData); + // Encoded url %-encodes all of the XML special characters except '&', + // so we need to do that manually + xmlOutput.append(url.toEncoded().replace('&', "&")); xmlOutput.append("\"/>\n"); break; + } default: fprintf(stderr, "Unknown dtd type\n"); } |