diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-28 15:38:07 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-28 15:40:55 +0100 |
| commit | 81e02ab202ea257e6c12f44291ffe69baf39790b (patch) | |
| tree | 86f3eb3d95e56c6376d255f119375746f964d72d /tests/manual | |
| parent | dbb39fc1fce3686a5161d68e89e96086fc664556 (diff) | |
| parent | 3b6b1b7fbc50bca101ad89a8acd80774bc668dde (diff) | |
Merge remote-tracking branch 'origin/1.1'
Conflicts:
qbs_version.pri
src/app/detect-toolchains/msvcprobe.cpp
src/app/detect-toolchains/probe.cpp
src/lib/language/language.cpp
version.js
Change-Id: I21c1e9a8bf0175d392cd2ff9fa5254a073ed0af8
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/minimumSystemVersion/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/manual/minimumSystemVersion/main.cpp b/tests/manual/minimumSystemVersion/main.cpp index 87dc09203..dab68af7e 100644 --- a/tests/manual/minimumSystemVersion/main.cpp +++ b/tests/manual/minimumSystemVersion/main.cpp @@ -27,9 +27,8 @@ int main(int argc, char *argv[]) while (dumpbin.waitForReadyRead()) { while (dumpbin.canReadLine()) { QString line = dumpbin.readLine(); - if (line.contains("version")) { + if (line.contains("version")) out << line.trimmed() << "\n"; - } } } |