Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
  I10n: Update German translations for 4.7.0
  Fix a freetype link failure.
  Fix configure test for DirectFB
  Split Symbian bearer plugin into three platform specfic plugins
  Doc: Fixed whitespace in the other configuration file for zh_CN.
  Doc: Fixed whitespace in the Simplified Chinese doc configuration.
  Unbreak Linux build when qendian.h is included before qglobal.h
  Revert accidental commit of irrelevant stuff. Silly mondays..
  Unbreak Linux build when qendian.h is included before qglobal.h
  Fix QApplication/QWidget to really take ownership of input contexts
  Added setting a hotspot on standard gestures
  Fixed GestureOverride event delivery in GraphicsView.
  add check-ts target to auto-asses translation completeness
  qt_ja_JP.ts => qt_ja.ts
  Fix incorrect \since tag
  XQuery test suite (and others): remove p4 dependency
  add docu about pixmaps being invalidated on qapp destruction
  remove somewhat misleading warning about x11 pixmap leak
  Disabled item view items use incorrect background color
  Update the mkspec for linux-icc: don't use jump tables in shlibs
  ...

1 files changed, 6 insertions, 8 deletions

diff --git a/configure b/configure
index 89cd97d..1980cf1 100755
--- a/configure
+++ b/configure
@@ -5834,14 +5834,12 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
        fi
 
        if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then
-           if [ -n "$PKG_CONFIG" ]; then
-               if $PKG_CONFIG --exists directfb 2>/dev/null; then
-                   QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
-                   QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
-               elif directfb-config --version >/dev/null 2>&1; then
-                   QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
-                   QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
-               fi
+           if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists directfb 2>/dev/null; then
+               QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
+               QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
+           elif directfb-config --version >/dev/null 2>&1; then
+               QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null`
+               QT_LIBS_DIRECTFB=`directfb-config --libs 2>/dev/null`
            fi
 
            # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.