feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix Android plugin to support Qt 5 style rules-files

Browse Source 
In Qt 5 we have modularized the rules files so that each module
specifies its own rules. This patch updates the plugin to support
reading from these in addition to the rules.xml of Qt 4 so that
it should work well for both.

The "replaces" attribute of the lib element is also added in Qt 5
because the files are generated and thus the approach of rules.xml
where replaces is a separate element and where the order has
semantics was not convenient. We of course support the
Necessitas approach as well.

Change-Id: Ife21903c9faf61e1791cf8c0ea78bb61c74dcb34
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt
2013-02-15 16:07:54 +01:00
parent 6f1509434f
commit a19ed6063a
2 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androiddeploystep.cpp
View File

@@ -262,7 +262,10 @@ int AndroidDeployStep::deviceAPILevel()
Utils::FileName AndroidDeployStep::localLibsRulesFilePath()
{
return AndroidManager::localLibsRulesFilePath(target());
Utils::FileName fileName = AndroidManager::localLibsRulesFilePath(target());
fileName.append(QLatin1String("/rules.xml"));
return fileName;
}
unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestination, QHash<QString, unsigned int> *cache)