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

resolve relative spec paths already on the command line

Browse Source 
this is way more predictable than resolving it later.

Change-Id: I0ce27977b795bde9235e1d51d6f2d0d917f2398c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-24 12:11:51 +01:00 committed by Qt by Nokia
parent 059200a44b
commit 08fe1f6871
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/option.cpp
View File

@ -147,6 +147,14 @@ static QString detectProjectFile(const QString &path)
return ret; return ret;
} }
static QString cleanSpec(const QString &spec)
{
QString ret = QDir::cleanPath(spec);
if (ret.contains('/'))
ret = QDir::cleanPath(QFileInfo(ret).absoluteFilePath());
return ret;
}
QString project_builtin_regx(); QString project_builtin_regx();
bool usage(const char *a0) bool usage(const char *a0)
{ {
@ -315,7 +323,7 @@ Option::parseCommandLine(int argc, char **argv, int skip)
} else if(opt == "cache") { } else if(opt == "cache") {
Option::mkfile::cachefile = argv[++x]; Option::mkfile::cachefile = argv[++x];
} else if(opt == "platform" || opt == "spec") { } else if(opt == "platform" || opt == "spec") {
Option::mkfile::qmakespec = argv[++x]; Option::mkfile::qmakespec = cleanSpec(argv[++x]);
Option::mkfile::qmakespec_commandline = argv[x]; Option::mkfile::qmakespec_commandline = argv[x];
} else { } else {
fprintf(stderr, "***Unknown option -%s\n", opt.toLatin1().constData()); fprintf(stderr, "***Unknown option -%s\n", opt.toLatin1().constData());