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

5 files changed, 19 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 04f6e7e..4e3b130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,8 @@ qrc_*.cpp
 *.vcproj
 *vcproj.*.*.user
 *.ncb
+*.vcxproj
+*.vcxproj.filters
 
 # MinGW generated files
 *.Debug
diff --git a/configure b/configure
index f2023b8..0111f51 100755
--- a/configure
+++ b/configure
@@ -2755,6 +2755,17 @@ fi
 
 if [ -z "${CFG_HOST_ARCH}" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+    GNU:*:*)
+        CFG_HOST_ARCH=`echo ${UNAME_MACHINE} | sed -e 's,[-/].*$,,'`
+        case "$CFG_HOST_ARCH" in
+            i?86)
+                CFG_HOST_ARCH=i386
+                ;;
+        esac
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    GNU/Hurd ($CFG_HOST_ARCH)"
+        fi
+        ;;
     IRIX*:*:*)
         CFG_HOST_ARCH=`uname -p`
         if [ "$OPT_VERBOSE" = "yes" ]; then
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index 076e8626..28070da 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -79,7 +79,8 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl
 
     resolveLayoutDirection();
     q->unsetWindowFrameMargins();
-    flags |= QGraphicsItem::ItemUsesExtendedStyleOption | QGraphicsItem::ItemSendsGeometryChanges;
+    flags |= QGraphicsItem::ItemUsesExtendedStyleOption;
+    flags |= QGraphicsItem::ItemSendsGeometryChanges;
     if (windowFlags & Qt::Window)
         flags |= QGraphicsItem::ItemIsPanel;
 }
diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 7bcad24..8005880 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -56,7 +56,7 @@ fi
 
 for module in $modules; do
     echo "#include <$module/$module>" >test.cpp
-    ${CXX-g++} $CXXFLAGS -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
+    g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
     mv test.cpp*.class $module.$2.txt
     # Remove template classes from the output
     perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</);
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 504512d..400fcc1 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -178,17 +178,13 @@ void tst_Bic::sizesAndVTables_data()
     QSKIP("Test not implemented for this compiler/platform", SkipAll);
 #else
 
-#if defined(FILESUFFIX)
-    // cross-testing
-#elif defined Q_OS_LINUX && defined Q_WS_X11
+#if defined Q_OS_LINUX && defined Q_WS_X11
 # if defined(__powerpc__) && !defined(__powerpc64__)
 #  define FILESUFFIX "linux-gcc-ppc32"
 # elif defined(__amd64__)
 #  define FILESUFFIX "linux-gcc-amd64"
 # elif defined(__i386__)
 #  define FILESUFFIX "linux-gcc-ia32"
-# elif defined(__ARMEL__)
-#  define FILESUFFIX "linux-gcc-armel"
 # endif
 #elif defined Q_OS_MAC && defined(__powerpc__)
 #  define FILESUFFIX "macx-gcc-ppc32"
@@ -237,11 +233,9 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
 #ifdef Q_OS_WIN
     qtDir.replace('\\', '/');
 #endif
-    QString compilerName = QString::fromLocal8Bit(qgetenv("CXX"));
-    if (compilerName.isEmpty())
-        compilerName = "g++";
+    QString compilerName = "g++";
 
-    QStringList args = QString::fromLocal8Bit(qgetenv("CXXFLAGS")).split(' ');
+    QStringList args;
     args << "-c"
          << "-I" + qtDir + "/include"
 #ifdef Q_OS_MAC