diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-09 16:13:07 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 23:12:23 +0200 |
commit | 910c717461a4d9321d537ddf87c0f642eb2a2902 (patch) | |
tree | 00bbbcfb20b159bd1efebbf1990b10c28c20615f /qmake | |
parent | 0a3a70a6cbc13fc6aec0a686ff98652ae2ee8e66 (diff) |
remove rather pointless parameter from parseCommandLine()
Change-Id: I97998555c41e8eab2438ac355950abf9dace24a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/option.cpp | 7 | ||||
-rw-r--r-- | qmake/option.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 3bfec96087..32c6e2a1b4 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -212,12 +212,12 @@ bool usage(const char *a0) } int -Option::parseCommandLine(int argc, char **argv, int skip) +Option::parseCommandLine(int argc, char **argv) { QStringList user_configs; bool before = true; - for(int x = skip; x < argc; x++) { + for (int x = 0; x < argc; x++) { if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */ QString opt = argv[x] + 1; @@ -478,7 +478,8 @@ Option::init(int argc, char **argv) } } if(argc && argv) { - int ret = parseCommandLine(argc, argv, 1); + argv++, argc--; + int ret = parseCommandLine(argc, argv); if(ret != Option::QMAKE_CMDLINE_SUCCESS) { if ((ret & Option::QMAKE_CMDLINE_SHOW_USAGE) != 0) usage(argv[0]); diff --git a/qmake/option.h b/qmake/option.h index 4e6098130a..09f568b243 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -200,7 +200,7 @@ struct Option }; private: - static int parseCommandLine(int, char **, int=0); + static int parseCommandLine(int, char **); }; inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); } |