From c8dead71865de3e09414c413faa38b53df09223b Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 13 May 2011 16:07:56 +0200
Subject: 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>
---
 bin/syncqt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'bin')

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();
-- 
cgit v1.2.3