From: Yoann Lopes <yoann.lopes@digia.com>
Date: Thu, 20 Feb 2014 15:59:19 +0000 (+0100)
Subject: androiddeployqt: always declare features as unrequired.
X-Git-Tag: upstream/5.2.90+alpha~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53dfdf45974b2a6ecb9debb6c7d916e2d0d3093e;p=platform%2Fupstream%2Fqttools.git

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>
---

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index c9e7afd..058cdd2 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\" />");