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: (61 commits)
  Revert Merge Request 551. This introduces regressions to Qt.
  Fixed scroll area size calculation on Mac.
  Fix a race where QThread::exit() is "lost" when called after start()
  make a partial build of linguist in no-gui config
  make the code less of a trap
  fix build from top level
  Partially revert MR 543 changes to Linguist.
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  Doc: update 'developing on mac'
  fcntl.h doesn't seem to exist, either - contrary to an example on msdn
  Autotest: fix paths on the test server after update.
  Force the repaint during a window resize.
  fix compile on wince
  remove CONFIG += ordered again
  Assistant: Check namespace and virtual folder syntax of help projects.
  ...

2 files changed, 1 insertions, 37 deletions

diff --git a/tests/benchmarks/corelib/tools/qvector/main.cpp b/tests/benchmarks/corelib/tools/qvector/main.cpp
index 6393eda..29c4440 100644
--- a/tests/benchmarks/corelib/tools/qvector/main.cpp
+++ b/tests/benchmarks/corelib/tools/qvector/main.cpp
@@ -208,7 +208,6 @@ private slots:
     void qvector_mutable_read_access();
     #ifdef TEST_RETURN
     void qvector_fill_and_return();
-    void qvector_fill_and_return2();
     #endif
 
     // Purre Standard solution
@@ -217,14 +216,12 @@ private slots:
     void stdvector_mutable_read_access();
     #ifdef TEST_RETURN
     void stdvector_fill_and_return();
-    void stdvector_fill_and_return2();
     #endif
 
     // Build using std, pass as QVector
     void mixedvector() { qWarning() << "mixed results: "; }
     #ifdef TEST_RETURN
     void mixedvector_fill_and_return();
-    void mixedvector_fill_and_return2();
     #endif
 
     // Alternative implementation
@@ -233,7 +230,6 @@ private slots:
     void qrawvector_mutable_read_access();
     #ifdef TEST_RETURN
     void qrawvector_fill_and_return();
-    void qrawvector_fill_and_return2();
     #endif
 };
 
@@ -280,7 +276,6 @@ void tst_QVector::qvector_mutable_read_access()
 
 #ifdef TEST_RETURN
 extern QVector<double> qvector_fill_and_return_helper();
-extern QVector<double> qvector_fill_and_return_helper2();
 
 void tst_QVector::qvector_fill_and_return()
 {
@@ -290,13 +285,6 @@ void tst_QVector::qvector_fill_and_return()
     }
 }
 
-void tst_QVector::qvector_fill_and_return2()
-{
-    QBENCHMARK {
-        QVector<double> v = qvector_fill_and_return_helper2();
-        s += v[1];
-    }
-}
 #endif
 
 
@@ -329,7 +317,6 @@ void tst_QVector::qrawvector_mutable_read_access()
 
 #ifdef TEST_RETURN
 extern QVector<double> qrawvector_fill_and_return_helper();
-extern QVector<double> qrawvector_fill_and_return_helper2();
 
 void tst_QVector::qrawvector_fill_and_return()
 {
@@ -339,13 +326,6 @@ void tst_QVector::qrawvector_fill_and_return()
     }
 }
 
-void tst_QVector::qrawvector_fill_and_return2()
-{
-    QBENCHMARK {
-        QVector<double> v = qrawvector_fill_and_return_helper();
-        s += v[1];
-    }
-}
 #endif
 
 
@@ -378,7 +358,6 @@ void tst_QVector::stdvector_mutable_read_access()
 
 #ifdef TEST_RETURN
 extern std::vector<double> stdvector_fill_and_return_helper();
-extern std::vector<double> stdvector_fill_and_return_helper2();
 
 void tst_QVector::stdvector_fill_and_return()
 {
@@ -388,13 +367,6 @@ void tst_QVector::stdvector_fill_and_return()
     }
 }
 
-void tst_QVector::stdvector_fill_and_return2()
-{
-    QBENCHMARK {
-        std::vector<double> v = stdvector_fill_and_return_helper2();
-        s += v[1];
-    }
-}
 #endif
 
 ///////////////////// mixed vector /////////////////////
@@ -402,7 +374,6 @@ void tst_QVector::stdvector_fill_and_return2()
 
 #ifdef TEST_RETURN
 extern QVector<double> mixedvector_fill_and_return_helper();
-extern QVector<double> mixedvector_fill_and_return_helper2();
 
 void tst_QVector::mixedvector_fill_and_return()
 {
@@ -412,13 +383,6 @@ void tst_QVector::mixedvector_fill_and_return()
     }
 }
 
-void tst_QVector::mixedvector_fill_and_return2()
-{
-    QBENCHMARK {
-        std::vector<double> v = stdvector_fill_and_return_helper2();
-        s += v[1];
-    }
-}
 #endif
 
 QTEST_MAIN(tst_QVector)
diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro
index adb30c9..ccab83a 100644
--- a/tests/benchmarks/corelib/tools/qvector/qvector.pro
+++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 TARGET = tst_vector
 QT = core
 INCLUDEPATH += .
-SOURCES += main.cpp outofline.cpp outofline2.cpp
+SOURCES += main.cpp outofline.cpp 
 CONFIG += release