summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2010-02-01 12:13:46 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2010-02-01 12:33:22 (GMT)
commit60ce0571065f11d8a6bf4fe40c059bd6563d9b42 (patch)
tree929e33586ba475469540800bd71a6033bcbf04d4
parent59d3c69f0294f930c81ac14269ba20d376d1c13c (diff)
downloadQt-60ce0571065f11d8a6bf4fe40c059bd6563d9b42.zip
Qt-60ce0571065f11d8a6bf4fe40c059bd6563d9b42.tar.gz
Qt-60ce0571065f11d8a6bf4fe40c059bd6563d9b42.tar.bz2
Fixing benchmark to be runnable on Symbian device
Deployment had to be done in proper way. Reviewed-by: TrustMe
-rw-r--r--tests/benchmarks/qstring/main.cpp6
-rw-r--r--tests/benchmarks/qstring/qstring.pro6
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/benchmarks/qstring/main.cpp b/tests/benchmarks/qstring/main.cpp
index 298c784..12826eb 100644
--- a/tests/benchmarks/qstring/main.cpp
+++ b/tests/benchmarks/qstring/main.cpp
@@ -42,6 +42,12 @@
#include <QFile>
#include <qtest.h>
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR ""
+#endif
+
class tst_QString: public QObject
{
Q_OBJECT
diff --git a/tests/benchmarks/qstring/qstring.pro b/tests/benchmarks/qstring/qstring.pro
index 6aad1c0..2e7c86a 100644
--- a/tests/benchmarks/qstring/qstring.pro
+++ b/tests/benchmarks/qstring/qstring.pro
@@ -5,8 +5,12 @@ SOURCES += main.cpp
wince*:{
DEFINES += SRCDIR=\\\"\\\"
+} else:symbian* {
+ addFiles.sources = utf-8.txt
+ addFiles.path = .
+ DEPLOYMENT += addFiles
+ TARGET.EPOCHEAPSIZE="0x100 0x1000000"
} else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-