summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-03-03 13:48:27 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-03-05 11:40:56 (GMT)
commiteb3c5cafccf035b81adedc11669cdbc93e9da474 (patch)
tree1b569ced4d5e25a93a121c923c68d5b589850344
parentb904dfd4cf8f741140f709e5a7344b2a7c64b50a (diff)
downloadQt-eb3c5cafccf035b81adedc11669cdbc93e9da474.zip
Qt-eb3c5cafccf035b81adedc11669cdbc93e9da474.tar.gz
Qt-eb3c5cafccf035b81adedc11669cdbc93e9da474.tar.bz2
fix qmake -project mode
the mode is a big hack, and consequently needs hacks to get started as well ... Reviewed-by: mariusSO (cherry picked from commit a1b0dba9971ef88dc1e079d1ea49230a4dd3c514)
-rw-r--r--qmake/option.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 6f0f46b..b41e39d 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -525,6 +525,17 @@ Option::init(int argc, char **argv)
}
#endif
}
+ } else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
+#if defined(Q_OS_MAC)
+ Option::host_mode = Option::HOST_MACX_MODE;
+ Option::target_mode = Option::TARG_MACX_MODE;
+#elif defined(Q_OS_UNIX)
+ Option::host_mode = Option::HOST_UNIX_MODE;
+ Option::target_mode = Option::TARG_UNIX_MODE;
+#else
+ Option::host_mode = Option::HOST_WIN_MODE;
+ Option::target_mode = Option::TARG_WIN_MODE;
+#endif
}
//defaults for globals