Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert 4.6 commits that shouldn't be in 4.7.
  Revert "Add a children private property needed for QML to support QGraphicsObject"
  Revert "struct -> class, it's better."
  Revert "Add NOTIFY to size property so QML bindings are working fine."
  Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
  Revert "Add a a layout property in QGraphicsWidget."
  Add a workaround for a bug in Mac filesystem watcher.
  Another "off by 1" problem in OpenVG - in paths this time.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 )
  Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
  do not detect the echo-without-newline syntax over and over
  speed up by removing nonsense
  no need for CONFIG += ordered here
  Autotest: don't allow choosing between debug/release mode.
  QS60Style: Custom QPushButton: Heigth is calculated wrongly
  Added additional logging to Phonon MMF backend
  Compile on MingW
  struct -> class, it's better.
  Add a a layout property in QGraphicsWidget.
  Fix QFileSystemModel to not install useless watchers on the filesystem

4 files changed, 6 insertions, 19 deletions

diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 4c0bc78..3313240 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -943,6 +943,7 @@ void tst_QGraphicsWidget::layout()
         layout->addItem(item);
         children.append(item);
     }
+    QSignalSpy spy(&widget, SIGNAL(layoutChanged()));
     widget.setLayout(layout);
 
     QTRY_COMPARE(widget.layout(), static_cast<QGraphicsLayout*>(layout));
@@ -951,7 +952,7 @@ void tst_QGraphicsWidget::layout()
         QCOMPARE(item->parentWidget(), (QGraphicsWidget *)&widget);
         QVERIFY(item->geometry() != QRectF(0, 0, -1, -1));
     }
-
+    QCOMPARE(spy.count(), 1);
     // don't crash
     widget.setLayout(0);
 }
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index 7eae3c1..e685cd3 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -140,7 +140,6 @@ namespace QTest {
         QExternalTestPrivate()
             : qtModules(QExternalTest::QtCore | QExternalTest::QtGui | QExternalTest::QtTest),
               appType(QExternalTest::AutoApplication),
-              debugMode(true),
               exitCode(-1)
         {
         }
@@ -156,7 +155,6 @@ namespace QTest {
         QByteArray programHeader;
         QExternalTest::QtModules qtModules;
         QExternalTest::ApplicationType appType;
-        bool debugMode;
 
         QString temporaryDir;
         QByteArray sourceCode;
@@ -190,16 +188,6 @@ namespace QTest {
         delete d;
     }
 
-    bool QExternalTest::isDebugMode() const
-    {
-        return d->debugMode;
-    }
-
-    void QExternalTest::setDebugMode(bool enable)
-    {
-        d->debugMode = enable;
-    }
-
     QList<QByteArray> QExternalTest::qmakeSettings() const
     {
         return d->qmakeLines;
@@ -524,10 +512,11 @@ namespace QTest {
             "INCLUDEPATH += . ");
         projectFile.write(QFile::encodeName(QDir::currentPath()));
 
-        if (debugMode)
+#ifndef QT_NO_DEBUG
             projectFile.write("\nCONFIG  += debug\n");
-        else
+#else
             projectFile.write("\nCONFIG  += release\n");
+#endif
 
         QByteArray extraSources = QFile::encodeName(extraProgramSources.join(" "));
         if (!extraSources.isEmpty()) {
diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h
index 5e79a7d..1170cd5 100644
--- a/tests/auto/qsharedpointer/externaltests.h
+++ b/tests/auto/qsharedpointer/externaltests.h
@@ -91,9 +91,6 @@ namespace QTest {
             QApplicationGuiServer
         };
 
-        bool isDebugMode() const;
-        void setDebugMode(bool enable);
-
         QList<QByteArray> qmakeSettings() const;
         void setQmakeSettings(const QList<QByteArray> &settings);
 
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 07df707..4e23cb1 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -1817,11 +1817,11 @@ void tst_QSharedPointer::invalidConstructs()
 #endif
 
     QTest::QExternalTest test;
-    test.setDebugMode(true);
     test.setQtModules(QTest::QExternalTest::QtCore);
     test.setExtraProgramSources(QStringList() << SRCDIR "forwarddeclared.cpp");
     test.setProgramHeader(
         "#define QT_SHAREDPOINTER_TRACK_POINTERS\n"
+        "#define QT_DEBUG\n"
         "#include <QtCore/qsharedpointer.h>\n"
         "#include <QtCore/qcoreapplication.h>\n"
         "\n"