summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-05-15 13:53:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-12 17:41:43 +0200
commitce6525efd81fe2d452961c5eacae0143db448daf (patch)
tree4e7987b257dcec93e33cfba0849242594a96e31b
parent45241871299d7c25882b68a82ee1e0359347d5d9 (diff)
fix default platform plugin for windows using configure script
Follow-up to 0074cc5d34a8ee314e864ba488dab1f0d0f94995. The configure script can be used for cross-building for Windows on unix. Change-Id: Ie7f9d0ff308ad5763cdf7b2664fa255e89bd5013 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 781c06b67e..d2aa41ccd8 100755
--- a/configure
+++ b/configure
@@ -4749,7 +4749,9 @@ if [ -z "$QT_QPA_DEFAULT_PLATFORM" ]; then
# check the mkspec
QT_QPA_DEFAULT_PLATFORM=`getXQMakeConf QT_QPA_DEFAULT_PLATFORM`
if [ -z "$QT_QPA_DEFAULT_PLATFORM" ]; then
- if [ "$BUILD_ON_MAC" = "yes" ]; then
+ if [ "$XPLATFORM_MINGW" = "yes" ]; then
+ QT_QPA_DEFAULT_PLATFORM="windows"
+ elif [ "$BUILD_ON_MAC" = "yes" ]; then
QT_QPA_DEFAULT_PLATFORM="cocoa"
elif [ "$UNAME_SYSTEM" = "QNX" ]; then
QT_QPA_DEFAULT_PLATFORM="qnx"