do not use resource files in benchmarks

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

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt
index c6edf51..e443d68 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/CMakeLists.txt
@@ -4,6 +4,4 @@ katie_gui_test(tst_bench_qgraphicsview
     ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chip.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chiptester.h
     ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/chip.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/chiptester/images.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qgraphicsview.qrc
 )

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
index cae2cb7..68af7fb 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -90,7 +90,7 @@ void ChipTester::populateScene()
 {
     scene = new QGraphicsScene;
 
-    QImage image(":/qt4logo.png");
+    QImage image(SRCDIR "/chiptester/qt4logo.png");
 
     // Populate scene
     int xx = 0;

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc
deleted file mode 100644 (file)
index 73e8620..0000000
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qt4logo.png</file>
-</qresource>
-</RCC>

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.qrc b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.qrc
deleted file mode 100644 (file)
index eff6e8d..0000000
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>images/designer.png</file>
-    <file>images/wine.png</file>
-    <file>images/wine-big.png</file>
-    <file>random.data</file>
-</qresource>
-</RCC>
-

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index e83fd61..3b289d0 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -525,11 +525,11 @@ void tst_QGraphicsView::imageRiver()
 
     QGraphicsScene scene(0, 0, 300, 300);
 
-    QPixmap pix(QLatin1String(":/images/designer.png"));
+    QPixmap pix(QLatin1String(SRCDIR "/images/designer.png"));
     QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
-    QFile file(QLatin1String(":/random.data"));
+    QFile file(QLatin1String(SRCDIR "/random.data"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     for (int i = 0; i < 50; ++i) {
@@ -634,11 +634,11 @@ void tst_QGraphicsView::textRiver()
 
     QGraphicsScene scene(0, 0, 300, 300);
 
-    QPixmap pix(QLatin1String(":/images/designer.png"));
+    QPixmap pix(QLatin1String(SRCDIR "/images/designer.png"));
     QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
-    QFile file(QLatin1String(":/random.data"));
+    QFile file(QLatin1String(SRCDIR "/random.data"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     for (int i = 0; i < 50; ++i) {
@@ -733,11 +733,11 @@ void tst_QGraphicsView::moveItemCache()
 
     QGraphicsScene scene(0, 0, 300, 300);
 
-    QPixmap pix(QLatin1String(":/images/wine.png"));
+    QPixmap pix(QLatin1String(SRCDIR "/images/wine.png"));
     QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
-    QFile file(QLatin1String(":/random.data"));
+    QFile file(QLatin1String(SRCDIR "/random.data"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     for (int i = 0; i < 5; ++i) {
@@ -822,19 +822,17 @@ void tst_QGraphicsView::paintItemCache_data()
 
 void tst_QGraphicsView::paintItemCache()
 {
-    Q_INIT_RESOURCE(qgraphicsview);
-
     QFETCH(bool, updatePartial);
     QFETCH(bool, rotation);
     QFETCH(int, cacheMode);
 
     QGraphicsScene scene(0, 0, 300, 300);
 
-    QPixmap pix(QLatin1String(":/images/wine.png"));
+    QPixmap pix(QLatin1String(SRCDIR "/images/wine.png"));
     QVERIFY(!pix.isNull());
 
     QList<QGraphicsItem *> items;
-    QFile file(QLatin1String(":/random.data"));
+    QFile file(QLatin1String(SRCDIR "/random.data"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     QDataStream str(&file);
     UpdatedPixmapCacheItem *item = new UpdatedPixmapCacheItem(updatePartial);
@@ -845,7 +843,7 @@ void tst_QGraphicsView::paintItemCache()
     item->setPos(-100, -100);
     scene.addItem(item);
 
-    QPixmap pix2(QLatin1String(":/images/wine-big.png"));
+    QPixmap pix2(QLatin1String(SRCDIR "/images/wine-big.png"));
     item = new UpdatedPixmapCacheItem(updatePartial);
     item->setPixmap(pix2);
     item->setCacheMode((QGraphicsItem::CacheMode)cacheMode);
@@ -876,4 +874,3 @@ void tst_QGraphicsView::paintItemCache()
 QTEST_MAIN(tst_QGraphicsView)
 
 #include "moc_tst_qgraphicsview.cpp"
-#include "qrc_qgraphicsview.cpp"

diff --git a/tests/benchmarks/script/qscriptclass_bytearray/CMakeLists.txt.broken b/tests/benchmarks/script/qscriptclass_bytearray/CMakeLists.txt.broken
index e6ceee8..eff0e4b 100644 (file)
--- a/tests/benchmarks/script/qscriptclass_bytearray/CMakeLists.txt.broken
+++ b/tests/benchmarks/script/qscriptclass_bytearray/CMakeLists.txt.broken
@@ -1,6 +1,5 @@
 katie_test(tst_bench_qscriptclass_bytearray
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_qscriptclass_bytearray.cpp
-    {CMAKE_CURRENT_SOURCE_DIR}/qscriptclass_bytearray.qrc
 )
 
 target_link_libraries(tst_bench_qscriptclass_bytearray KtScript)

diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc
deleted file mode 100644 (file)
index a894ee5..0000000
--- a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>tests</file>
-</qresource>
-</RCC>

diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp
index 338f4af..b6f56a5 100644 (file)
--- a/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp
@@ -54,7 +54,7 @@ private:
 
 tst_QScriptClass_ByteArray::tst_QScriptClass_ByteArray()
 {
-    testsDir = QDir(QLatin1String(":/tests"));
+    testsDir = QDir(QLatin1String(SRCDIR "/tests"));
     if (!testsDir.exists())
         qWarning("*** no tests/ dir!");
 }
@@ -88,4 +88,3 @@ void tst_QScriptClass_ByteArray::benchmark()
 QTEST_MAIN(tst_QScriptClass_ByteArray)
 
 #include "moc_tst_qscriptclass_bytearray.cpp"
-#include "qrc_qscriptclass_bytearray.cpp"

diff --git a/tests/benchmarks/script/sunspider/CMakeLists.txt b/tests/benchmarks/script/sunspider/CMakeLists.txt
index 4f1d853..e8e5810 100644 (file)
--- a/tests/benchmarks/script/sunspider/CMakeLists.txt
+++ b/tests/benchmarks/script/sunspider/CMakeLists.txt
@@ -1,6 +1,5 @@
 katie_test(tst_bench_sunspider
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_sunspider.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sunspider.qrc
 )
 
 target_link_libraries(tst_bench_sunspider KtScript)

diff --git a/tests/benchmarks/script/sunspider/sunspider.qrc b/tests/benchmarks/script/sunspider/sunspider.qrc
deleted file mode 100644 (file)
index a894ee5..0000000
--- a/tests/benchmarks/script/sunspider/sunspider.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>tests</file>
-</qresource>
-</RCC>

diff --git a/tests/benchmarks/script/sunspider/tst_sunspider.cpp b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
index f5e6f78..4eb8ffd 100644 (file)
--- a/tests/benchmarks/script/sunspider/tst_sunspider.cpp
+++ b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
@@ -59,7 +59,7 @@ private:
 
 tst_SunSpider::tst_SunSpider()
 {
-    testsDir = QDir(QLatin1String(":/tests"));
+    testsDir = QDir(QLatin1String(SRCDIR "/tests"));
     if (!testsDir.exists())
         qWarning("*** no tests/ dir!");
 }
@@ -105,4 +105,3 @@ void tst_SunSpider::benchmark()
 QTEST_MAIN(tst_SunSpider)
 
 #include "moc_tst_sunspider.cpp"
-#include "qrc_sunspider.cpp"

diff --git a/tests/benchmarks/script/v8/CMakeLists.txt b/tests/benchmarks/script/v8/CMakeLists.txt
index 6659d62..9096a70 100644 (file)
--- a/tests/benchmarks/script/v8/CMakeLists.txt
+++ b/tests/benchmarks/script/v8/CMakeLists.txt
@@ -1,6 +1,5 @@
 katie_test(tst_bench_v8
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_v8.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/v8.qrc
 )
 
 target_link_libraries(tst_bench_v8 KtScript)

diff --git a/tests/benchmarks/script/v8/tst_v8.cpp b/tests/benchmarks/script/v8/tst_v8.cpp
index 23452ed..1daf527 100644 (file)
--- a/tests/benchmarks/script/v8/tst_v8.cpp
+++ b/tests/benchmarks/script/v8/tst_v8.cpp
@@ -58,7 +58,7 @@ private:
 
 tst_V8::tst_V8()
 {
-    testsDir = QDir(QLatin1String(":/tests"));
+    testsDir = QDir(QLatin1String(SRCDIR "/tests"));
     if (!testsDir.exists())
         qWarning("*** no tests/ dir!");
 }
@@ -114,4 +114,3 @@ void tst_V8::benchmark()
 QTEST_MAIN(tst_V8)
 
 #include "moc_tst_v8.cpp"
-#include "qrc_v8.cpp"

diff --git a/tests/benchmarks/script/v8/v8.qrc b/tests/benchmarks/script/v8/v8.qrc
deleted file mode 100644 (file)
index a894ee5..0000000
--- a/tests/benchmarks/script/v8/v8.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>tests</file>
-</qresource>
-</RCC>