summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-12 11:02:01 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-12 12:48:12 +0200
commit6697f2a899fac47a65122a85691b2cfe63c6152c (patch)
tree6ae8ad93c7455f9571d1b1b868ae077af89d96df /configure
parente577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff)
parent1f806aa1b40db276dad359863d018171080d93f9 (diff)
Merge remote branch 'origin/master' into refactor
Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 0be1497d1c..f12cdb6165 100755
--- a/configure
+++ b/configure
@@ -5774,7 +5774,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye
fi # X11/QWS/Lighthouse
# X11
-if [ "$PLATFORM_X11" = "yes" ]; then
+if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then
x11tests="$relpath/config.tests/x11"
X11TESTS_FLAGS=
@@ -8438,7 +8438,7 @@ if [ -n "$QT_CFLAGS_FPU" ]; then
fi
if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then
- echo "\n#Qt opengl include path" >> "$QTCONFIG.tmp"
+ echo "#Qt opengl include path" >> "$QTCONFIG.tmp"
echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" >> "$QTCONFIG.tmp"
fi