summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-25 14:44:30 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-30 17:06:23 (GMT)
commit662c1f24f75a056364424b836f500623ce2b2367 (patch)
treed1705733266380052cc97509e8092b1e33f88f3b /qmake
parent1e4242a39cc43d8f55e68cc004945b10d2aca948 (diff)
downloadQt-662c1f24f75a056364424b836f500623ce2b2367.zip
Qt-662c1f24f75a056364424b836f500623ce2b2367.tar.gz
Qt-662c1f24f75a056364424b836f500623ce2b2367.tar.bz2
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> (cherry picked from qtbase/e7c3b21b7c1ed9247cb2f9eeddc154534a038549)
Diffstat (limited to 'qmake')
-rw-r--r--qmake/option.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 2417281..76932c1 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -444,6 +444,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