summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-07 21:51:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-07 21:51:10 (GMT)
commita32650dc78c925a9b4aed179c80f6e27a67d436b (patch)
tree9071b44b04af7c7fdb6930c23c495d8b79e54a94 /configure
parentf2a96da63ce8b351232ee6891fc0f664f563a8ba (diff)
parent161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff)
downloadQt-a32650dc78c925a9b4aed179c80f6e27a67d436b.zip
Qt-a32650dc78c925a9b4aed179c80f6e27a67d436b.tar.gz
Qt-a32650dc78c925a9b4aed179c80f6e27a67d436b.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 51039da..bf81e26 100755
--- a/configure
+++ b/configure
@@ -5498,8 +5498,8 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
# auto-detect icd support
if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings 2>/dev/null`
- QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings 2>/dev/null`
+ QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings icd2 2>/dev/null`
+ QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings icd2 2>/dev/null`
fi
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then
[ "$CFG_ICD" = "auto" ] && CFG_ICD=yes