diff options
author | axis <qt-info@nokia.com> | 2011-05-13 16:07:56 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-02 22:54:08 +0200 |
commit | c8dead71865de3e09414c413faa38b53df09223b (patch) | |
tree | f53ba3d43552b2691193d1e50761284aa28f055d /bin | |
parent | 1fb4d6737c09a5d6e1bbcf135029cd0a7f2e72f6 (diff) |
Fixed an argument parsing bug in syncqt.
We need to move the detection up above the general -no-* match,
otherwise it never hits.
Change-Id: I04ab5a1ed2c4a01219e7b9e10948b3fc4989f4b8
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/syncqt b/bin/syncqt index 69d50ec4ca..7cf8b1b45a 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -590,6 +590,12 @@ while ( @ARGV ) { $arg eq "-relative" || $arg eq "-check-includes") { $var = substr($arg, 1); $val = "yes"; + } elsif($arg eq "-no-module-fwd") { + $var = "no_module_fwd"; + $val = "yes"; + } elsif($arg eq "-no-module-version-header") { + $var = "no_module_version_header"; + $val = "yes"; } elsif($arg =~ /^-no-(.*)$/) { $var = $1; $val = "no"; @@ -619,12 +625,6 @@ while ( @ARGV ) { # skip, it's been dealt with at the top of the file shift @ARGV; next; - } elsif($arg eq "-no-module-fwd") { - $var = "no_module_fwd"; - $val = "yes"; - } elsif($arg eq "-no-module-version-header") { - $var = "no_module_version_header"; - $val = "yes"; } elsif($arg =~/^-/) { print "Unknown option: $arg\n\n" if(!$var); showUsage(); |