summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-25 16:44:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-26 12:08:24 +0200
commite7c3b21b7c1ed9247cb2f9eeddc154534a038549 (patch)
tree9ecb25b39614b38f172addcf9bdc78dea872faa7
parent9f1b64766b64fac2df8dd112d2801c15a781bdf9 (diff)
make sure qmake finds itself in CWD on windows
and consequently that it finds qt.conf. Task-number: QTBUG-30583 Change-Id: I48441477e941d9609270d6e5e1b405127c0c0aca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--qmake/option.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 983d3490d8..4f7cdb34a2 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -338,6 +338,7 @@ Option::init(int argc, char **argv)
QDir currentDir = QDir::current();
#ifdef Q_OS_WIN
QStringList paths = QString::fromLocal8Bit(pEnv).split(QLatin1String(";"));
+ paths.prepend(QLatin1String("."));
#else
QStringList paths = QString::fromLocal8Bit(pEnv).split(QLatin1String(":"));
#endif