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: (27 commits)
  Work around a compiler bug on 64-bit.
  Fix handling of braces/no-braces in QUrl::host / setHost.
  Changes (and minor corrections) to QByteArray documentation.
  QtWebKit: Update tag files to match the same content on qtwebkit.git
  QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
  QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
  uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
  uic: Improve messages.
  Tools (uic/rcc): Improve warning messages.
  QDir: Removed checks for existance of fileEngine
  QDir and QFileInfo shouldn't lose properties when detaching
  Another bug-o introduced in fixing QDirPrivate refactoring
  Reverting QDir::detach introduced earlier
  QFileInfo: Prepare for engine-less implementation
  Removed QFileInfoPrivate::initFileEngine
  Simplify QDir::cd
  QDir::makeAbsolute could self-destruct on failure
  QDir::operator= simplification
  QDirPrivate refactoring
  QDirPrivate refactoring
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/configure b/configure
index cb7d4f0..1ad0181 100755
--- a/configure
+++ b/configure
@@ -7181,6 +7181,7 @@ if [ "$CFG_WEBKIT" = "yes" ]; then
     # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
     CFG_WEBKIT="yes"
 else
+    rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri"
     CFG_WEBKIT="no"
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 fi