summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-02-20 16:59:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-21 14:39:56 +0100
commit53dfdf45974b2a6ecb9debb6c7d916e2d0d3093e (patch)
tree001bf20b0f04f8c857e7f571cba477c844283b2a
parente75f3014918167b72ca1dfba446e923da80e8f0a (diff)
androiddeployqt: always declare features as unrequired.
Features declared by Qt modules are not necessarily used by an app, so we mark them as unrequired. It's the responsibility of the developer to mark them as required if needed. Task-number: QTBUG-36921 Change-Id: Id0de248347d49c119bc9a1c37f4d0882065a1601 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/androiddeployqt/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index c9e7afd6c..058cdd281 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -895,7 +895,7 @@ bool updateAndroidManifest(Options &options)
QString features;
foreach (QString feature, options.features)
- features += QString::fromLatin1(" <uses-feature android:name=\"%1\" />\n").arg(feature);
+ features += QStringLiteral(" <uses-feature android:name=\"%1\" android:required=\"false\" />\n").arg(feature);
if (usesGL)
features += QStringLiteral(" <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />");