resolve relative spec paths already on the command line

this is way more predictable than resolving it later.

Change-Id: I0ce27977b795bde9235e1d51d6f2d0d917f2398c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/qmake/option.cpp b/qmake/option.cpp
index 306e6b5286..0c649fdd77 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -147,6 +147,14 @@ static QString detectProjectFile(const QString &path)
     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();
 bool usage(const char *a0)
 {
@@ -315,7 +323,7 @@ Option::parseCommandLine(int argc, char **argv, int skip)
                     } else if(opt == "cache") {
                         Option::mkfile::cachefile = argv[++x];
                     } else if(opt == "platform" || opt == "spec") {
-                        Option::mkfile::qmakespec = argv[++x];
+                        Option::mkfile::qmakespec = cleanSpec(argv[++x]);
                         Option::mkfile::qmakespec_commandline = argv[x];
                     } else {
                         fprintf(stderr, "***Unknown option -%s\n", opt.toLatin1().constData());