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

remove rather pointless parameter from parseCommandLine()

Browse Source 
Change-Id: I97998555c41e8eab2438ac355950abf9dace24a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-09 16:13:07 +02:00 committed by Qt by Nokia
parent 0a3a70a6cb
commit 910c717461
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/option.cpp
View File

@ -212,12 +212,12 @@ bool usage(const char *a0)
} }
int int
Option::parseCommandLine(int argc, char **argv, int skip) Option::parseCommandLine(int argc, char **argv)
{ {
QStringList user_configs; QStringList user_configs;
bool before = true; 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 */ if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */
QString opt = argv[x] + 1; QString opt = argv[x] + 1;
@ -478,7 +478,8 @@ Option::init(int argc, char **argv)
} }
} }
if(argc && 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_SUCCESS) {
if ((ret & Option::QMAKE_CMDLINE_SHOW_USAGE) != 0) if ((ret & Option::QMAKE_CMDLINE_SHOW_USAGE) != 0)
usage(argv[0]); usage(argv[0]);

2
qmake/option.h
View File

@ -200,7 +200,7 @@ struct Option
}; };
private: 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); } inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }