do not use resources in QRegExp and QSvgRenderer benchmarks

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

diff --git a/tests/benchmarks/core/tools/qregexp/CMakeLists.txt b/tests/benchmarks/core/tools/qregexp/CMakeLists.txt
index 2ae8e43..d708231 100644 (file)
--- a/tests/benchmarks/core/tools/qregexp/CMakeLists.txt
+++ b/tests/benchmarks/core/tools/qregexp/CMakeLists.txt
@@ -1,6 +1,5 @@
 katie_test(tst_bench_qregexp
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/qregexp.qrc
 )
 
 target_link_libraries(tst_bench_qregexp KtScript)

diff --git a/tests/benchmarks/core/tools/qregexp/main.cpp b/tests/benchmarks/core/tools/qregexp/main.cpp
index 8c482e0..c11700a 100644 (file)
--- a/tests/benchmarks/core/tools/qregexp/main.cpp
+++ b/tests/benchmarks/core/tools/qregexp/main.cpp
@@ -82,7 +82,7 @@ tst_qregexp::tst_qregexp()
     :QObject()
     ,str1("We are all happy monkeys")
 {
-        QFile f(":/main.cpp");
+        QFile f(SRCDIR "/main.cpp");
         f.open(QFile::ReadOnly);
         str2=f.readAll();
 }
@@ -491,4 +491,3 @@ void tst_qregexp::horribleReplaceJSC()
 QTEST_MAIN(tst_qregexp)
 
 #include "moc_main.cpp"
-#include "qrc_qregexp.cpp"

diff --git a/tests/benchmarks/core/tools/qregexp/qregexp.qrc b/tests/benchmarks/core/tools/qregexp/qregexp.qrc
deleted file mode 100644 (file)
index a7fe13c..0000000
--- a/tests/benchmarks/core/tools/qregexp/qregexp.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>main.cpp</file>
-</qresource>
-</RCC>
-

diff --git a/tests/benchmarks/svg/qsvgrenderer/CMakeLists.txt b/tests/benchmarks/svg/qsvgrenderer/CMakeLists.txt
index ad106d8..5c26164 100644 (file)
--- a/tests/benchmarks/svg/qsvgrenderer/CMakeLists.txt
+++ b/tests/benchmarks/svg/qsvgrenderer/CMakeLists.txt
@@ -1,6 +1,5 @@
 katie_test(tst_bench_qsvgrenderer
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_qsvgrenderer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/qsvgrenderer.qrc
 )
 
 target_link_libraries(tst_bench_qsvgrenderer KtSvg)

diff --git a/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.qrc b/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.qrc
deleted file mode 100644 (file)
index bdf4a31..0000000
--- a/tests/benchmarks/svg/qsvgrenderer/qsvgrenderer.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>data/tiger.svg</file>
-</qresource>
-</RCC>
-

diff --git a/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
index ecb0de1..3f44666 100644 (file)
--- a/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/benchmarks/svg/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -68,7 +68,7 @@ void tst_QSvgRenderer::construct()
 
 void tst_QSvgRenderer::load()
 {
-    QFile file(QLatin1String(":/data/tiger.svg"));
+    QFile file(QLatin1String(SRCDIR "/data/tiger.svg"));
     if (!file.open(QFile::ReadOnly))
         QFAIL("Can not open tiger.svg");
     QByteArray data = file.readAll();
@@ -82,4 +82,3 @@ void tst_QSvgRenderer::load()
 QTEST_MAIN(tst_QSvgRenderer)
 
 #include "moc_tst_qsvgrenderer.cpp"
-#include "qrc_qsvgrenderer.cpp"