From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Mon, 4 Nov 2013 13:00:08 +0000 (+0100)
Subject: androiddeployqt: Put back default app name
X-Git-Tag: accepted/tizen/20131212.181521~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4be30140ffb095a77a4a83c863c385c4dbc08014;p=platform%2Fupstream%2Fqttools.git

androiddeployqt: Put back default app name

When no custom AndroidManifest.xml is specified, we need to
generate a sensible default name like before.

Change-Id: I9411594c43f6d2b3a49686bb6fbab9d999d788c3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index f69b205..5075a60 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -910,6 +910,7 @@ bool updateStringsXml(const Options &options)
         fprintf(stdout, "  -- res/values/strings.xml\n");
 
     QHash<QString, QString> replacements;
+    replacements["<!-- %%INSERT_APP_NAME%% -->"] = QFileInfo(options.applicationBinary).baseName().mid(sizeof("lib") - 1);
 
     QString fileName = options.outputDirectory + QLatin1String("/res/values/strings.xml");
     if (!QFile::exists(fileName)) {