1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite loop in qmake option parsing

Browse Source 
If calling 'qmake -qtconf file' an infinite loop occurs.

Bug introduced in 661b586a69740bd9a1791622f8b238d290ebe00d

Pick-to: 6.1 6.1.0 6.0
Change-Id: I3ccc067570308227b605d700b41b299800aa872a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Jonas Karlsson 2021-04-22 14:47:10 +02:00
parent 948261d70c
commit 6b1a7341fe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/option.cpp
View File

@ -399,10 +399,11 @@ Option::init(int argc, char **argv)
} else if (opt == "-makefile") { } else if (opt == "-makefile") {
Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE; Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE;
} else if (opt == "-qtconf") { } else if (opt == "-qtconf") {
// Move the argument following "-qtconf <file>" in front and check again. if (args.length() >= 3) {
if (args.length() >= 3) // Move the argument following "-qtconf <file>" in front and check again.
args.prepend(args.takeAt(2)); args.prepend(args.takeAt(2));
continue; continue;
}
} else { } else {
break; break;
} }