summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-07 08:56:24 (GMT)
committeraxis <qt-info@nokia.com>2009-10-23 09:25:54 (GMT)
commit5486f14afb34608d16f62a575499712b20073162 (patch)
tree9f276223251c024e1628b19693267513ac9c4b8b
parent4ce556b952545494a8adb96f628c219a38406562 (diff)
downloadQt-5486f14afb34608d16f62a575499712b20073162.zip
Qt-5486f14afb34608d16f62a575499712b20073162.tar.gz
Qt-5486f14afb34608d16f62a575499712b20073162.tar.bz2
Make it possible to cross-compile for non-x11-non-qws platforms.
Don't set PLATFORM_X11 unless we do have X11 libs in our xqmakespec.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 485c71c..a3c8cba 100755
--- a/configure
+++ b/configure
@@ -3851,7 +3851,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
Platform="Qt for Embedded Linux"
elif [ "$PLATFORM_MAC" = "yes" ]; then
Platform="Qt/Mac"
-else
+elif [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ]; then
PLATFORM_X11=yes
Platform="Qt/X11"
fi