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

Android: fixed updating Java files on Windows.

Browse Source 
When looking for lines in Java files that are not supported by the
selected API level, it didn't take into account that line endings are
"\r\n" on Windows. toInt() was failing, trying to convert for example
"10\r" to an integer.

Change-Id: I35478abd40d5ce4621d2320b3a5f5a3514cf9591
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Yoann Lopes
2013-06-03 19:58:30 +02:00
parent b0854e3c71
commit bab3b010af
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidmanager.cpp
View File

@@ -633,19 +633,20 @@ void AndroidManager::updateTarget(ProjectExplorer::Target *target, const QString
bool modified = false;
bool comment = false;
for (int i = 0; i < lines.size(); i++) {
if (lines[i].contains("@ANDROID-")) {
commentLines = targetSDKNumber < lines[i].mid(lines[i].lastIndexOf('-') + 1).toInt();
QByteArray trimmed = lines[i].trimmed();
if (trimmed.contains("@ANDROID-")) {
commentLines = targetSDKNumber < trimmed.mid(trimmed.lastIndexOf('-') + 1).toInt();
comment = !comment;
continue;
}
if (!comment)
continue;
if (commentLines) {
if (!lines[i].trimmed().startsWith("//QtCreator")) {
if (!trimmed.startsWith("//QtCreator")) {
lines[i] = "//QtCreator " + lines[i];
modified = true;
}
} else { if (lines[i].trimmed().startsWith("//QtCreator")) {
} else { if (trimmed.startsWith("//QtCreator")) {
lines[i] = lines[i].mid(12);
modified = true;
}