From bab3b010af548b2fdd401dc90e17d30cfe2abceb Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 3 Jun 2013 19:58:30 +0200 Subject: [PATCH] Android: fixed updating Java files on Windows. 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 --- src/plugins/android/androidmanager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 03aa1b56b67..ed2fb8d10fe 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -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; }