adjust some benchamrks so they build

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/scripts/incfsck.py b/scripts/incfsck.py
index 5dbc914..ccbaf04 100755 (executable)
--- a/scripts/incfsck.py
+++ b/scripts/incfsck.py
@@ -208,6 +208,7 @@ incmap = {
         'QAccessibleTable2CellInterface': 'qaccessible2.h',
         'QAccessibleTable2Interface': 'qaccessible2.h',
         'QAccessibleTableInterface': 'qaccessible2.h',
+        'QTextLength': 'qtextformat.h',
         'QMacCocoaViewContainer': 'qmaccocoaviewcontainer_mac.h',
         # 'QPlatformIntegrationPlugin': 'qplatformintegrationplugin_qpa.h',
         # 'QPlatformIntegration': 'qplatformintegration_qpa.h',

diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
deleted file mode 100644 (file)
index ae41b9a..0000000
--- a/tests/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# if(WITH_OPENGL AND OPENGL_FOUND)
-#     add_subdirectory(opengl)
-# endif()
-# if(WITH_DBUS AND DBUS_FOUND)
-#     add_subdirectory(dbus)
-# endif()

diff --git a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
index 8962967..3626a11 100644 (file)
--- a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
@@ -282,4 +282,5 @@ void tst_QScriptClass::iterate()
 }
 
 QTEST_MAIN(tst_QScriptClass)
-#include "tst_qscriptclass.moc"
+
+#include "moc_tst_qscriptclass.cpp"

diff --git a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
index fc3e849..1541570 100644 (file)
--- a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp
@@ -42,12 +42,10 @@
 #include <qtest.h>
 #include <QtScript>
 
-#include <QtScript/private/qscriptdeclarativeclass_p.h>
+#include <QtScript/qscriptdeclarativeclass_p.h>
 
 Q_DECLARE_METATYPE(QScriptValue)
 
-//TESTED_FILES=
-
 class tst_QScriptEngine : public QObject
 {
     Q_OBJECT
@@ -572,4 +570,5 @@ void tst_QScriptEngine::readScopeProperty()
 }
 
 QTEST_MAIN(tst_QScriptEngine)
-#include "tst_qscriptengine.moc"
+
+#include "moc_tst_qscriptengine.cpp"

diff --git a/tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp b/tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp
index 6833e86..0c2c0e8 100644 (file)
--- a/tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp
@@ -1262,4 +1262,5 @@ void tst_QScriptQObject::callQScriptableSlot()
 }
 
 QTEST_MAIN(tst_QScriptQObject)
-#include "tst_qscriptqobject.moc"
+
+#include "moc_tst_qscriptqobject.cpp"

diff --git a/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp b/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
index 79275f9..13031a0 100644 (file)
--- a/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp
@@ -44,8 +44,6 @@
 
 Q_DECLARE_METATYPE(QScriptValue)
 
-//TESTED_FILES=
-
 class tst_QScriptValue : public QObject
 {
     Q_OBJECT
@@ -1019,4 +1017,5 @@ void tst_QScriptValue::defineStandardTestValues()
 }
 
 QTEST_MAIN(tst_QScriptValue)
-#include "tst_qscriptvalue.moc"
+
+#include "moc_tst_qscriptvalue.cpp"

diff --git a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
index 8164669..2eaae8c 100644 (file)
--- a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
+++ b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
@@ -42,8 +42,6 @@
 #include <qtest.h>
 #include <QtScript>
 
-//TESTED_FILES=
-
 class tst_QScriptValueIterator : public QObject
 {
     Q_OBJECT
@@ -290,4 +288,5 @@ void tst_QScriptValueIterator::iterateArrayAndRemoveAllElements()
 }
 
 QTEST_MAIN(tst_QScriptValueIterator)
-#include "tst_qscriptvalueiterator.moc"
+
+#include "moc_tst_qscriptvalueiterator.cpp"

diff --git a/tests/benchmarks/script/sunspider/tst_sunspider.cpp b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
index 195c3a9..a19aa47 100644 (file)
--- a/tests/benchmarks/script/sunspider/tst_sunspider.cpp
+++ b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
@@ -120,5 +120,5 @@ void tst_SunSpider::benchmark()
 
 QTEST_MAIN(tst_SunSpider)
 
-#include "tst_sunspider.moc"
+#include "moc_tst_sunspider.cpp"
 #include "qrc_sunspider.cpp"