Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile IPC tests.
  Always call XInitThreads.
  Remove redundant #ifdef's from benchmarks
  Improve coding style of qdatastream test
  Don't use Qt3Support in arthur test suite.
  Remove Qt3Support code from QMenuBar autotest
  Remove Qt3Support code from QSplitter autotest
  Remove Qt3Support code from QSharedPointer autotest
  Remove Qt3Support code from QComboBox autotest
  Remove Qt3Support test code from accessibility autotest
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test

1 files changed, 5 insertions, 19 deletions

diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index d525068893..33a630076e 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -1230,21 +1230,17 @@ void tst_QComboBox::insertItem_data()
     QTest::addColumn<int>("insertIndex");
     QTest::addColumn<QString>("itemLabel");
     QTest::addColumn<int>("expectedIndex");
-    QTest::addColumn<bool>("testQt3Support");
     QTest::addColumn<bool>("editable");
 
     QStringList initialItems;
     initialItems << "foo" << "bar";
     for(int e = 0 ; e<2 ; e++) {
         bool editable = (e==0);
-        QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << false << editable;
-        QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << false << editable;
-        QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << false << editable;
-        QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << false << editable;
-        QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << false << editable;
-#if defined(QT3_SUPPORT)
-        QTest::newRow("Qt3Support: Insert less then 0") << initialItems << -1 << "inserted" << 2 << true << editable;
-#endif
+        QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << editable;
+        QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << editable;
+        QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << editable;
+        QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << editable;
+        QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << editable;
     }
 }
 
@@ -1254,7 +1250,6 @@ void tst_QComboBox::insertItem()
     QFETCH(int, insertIndex);
     QFETCH(QString, itemLabel);
     QFETCH(int, expectedIndex);
-    QFETCH(bool, testQt3Support);
     QFETCH(bool, editable);
 
     testWidget->insertItems(0, initialItems);
@@ -1263,16 +1258,7 @@ void tst_QComboBox::insertItem()
     testWidget->setEditable(true);
     if (editable)
         testWidget->setEditText("FOO");
-#if defined (QT3_SUPPORT)
-    if (testQt3Support)
-        testWidget->insertItem(itemLabel, insertIndex);
-    else
-        testWidget->insertItem(insertIndex, itemLabel);
-#else
-    Q_UNUSED(testQt3Support);
     testWidget->insertItem(insertIndex, itemLabel);
-#endif
-
 
     QCOMPARE(testWidget->count(), initialItems.count() + 1);
     QCOMPARE(testWidget->itemText(expectedIndex), itemLabel);