summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-19 04:06:02 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-19 04:06:02 (GMT)
commitf9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch)
tree65f3b637a19ff47fcc97e3f22deeae7d843cad17 /qmake/option.cpp
parent331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff)
parent8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff)
downloadQt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip
Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz
Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts: mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index b41e39d..d7c5397 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -410,6 +410,7 @@ Option::init(int argc, char **argv)
Option::res_ext = ".res";
#else
Option::dirlist_sep = ":";
+ Option::shellPath = QStringList("sh");
#endif
Option::sysenv_mod = "QMAKE_ENV_";
Option::field_sep = ' ';