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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  don't crash when destroying the shortcuts
  Disable activeqt on win32-g++ (it doesn't build).
  fix warning
  remove unused functions
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix a typo in qt-conf docs.
  Revert "Fix build with the Clang compiler"
  Added missing no_include_pwd check
  Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
  Fix build with the Clang compiler
  Change spacing of title in offline style.
  Add support for rawFonts loaded from data in FaceId
  examples: fix compilation with namespaced Qt.
  Russian translation update
  Update Japanese translations for Qt 4.8.
  directfb: Include directfbgl.h directly
  tests: fix QNetworkProxyFactory test
  don't detach until the list is going to be modified
  optimize QList::removeAll()

1 files changed, 4 insertions, 0 deletions

diff --git a/configure b/configure
index a0e237ead8..b5905077f6 100755
--- a/configure
+++ b/configure
@@ -9017,6 +9017,10 @@ for file in .projects .projects.3; do
             if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
                 continue
             fi;;
+        *activeqt/*)
+            if [ "$PLATFORM" = "win32-g++" ] || [ "$XPLATFORM" = "win32-g++" ]; then
+                continue
+            fi;;
         *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;