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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Export qt_directfb_.* functions in plugin as well
  Added autotest for QPixmap::size() with null pixmaps.
  Update Symbian def files.
  QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect().
  Wrong bounding rect returned by QGraphicsEffect::boundingRect().
  Compile on Mac
  Ensure building of WebKit and QtConcurrent are disabled with SunCC.

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 1ad0181..b933ac1 100755
--- a/configure
+++ b/configure
@@ -7051,7 +7051,7 @@ case "$XPLATFORM" in
                 canBuildQtXmlPatterns="no"
                 canBuildQtConcurrent="no"
                 ;;
-            5.9)
+            5.*)
                 canBuildWebKit="no"
                 canBuildQtConcurrent="no"
                 ;;