summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-17 08:20:30 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-17 08:20:30 (GMT)
commit4d4cb1023d693a2a4130e032c8894e0f56250f93 (patch)
tree24e3db8d63b7149b81c3b509fb5b820caf7ecbff /tests/benchmarks
parent8fe40ca28e88d156b9a0ef9cc4c818a666499231 (diff)
parentbdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff)
downloadQt-4d4cb1023d693a2a4130e032c8894e0f56250f93.zip
Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.gz
Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.bz2
Merge commit 'qt/4.7' into 4.7
Conflicts: tests/benchmarks/declarative/binding/binding.pro tests/benchmarks/declarative/creation/creation.pro tests/benchmarks/declarative/creation/tst_creation.cpp tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
Diffstat (limited to 'tests/benchmarks')
-rw-r--r--tests/benchmarks/declarative/binding/binding.pro1
-rw-r--r--tests/benchmarks/declarative/creation/creation.pro4
-rw-r--r--tests/benchmarks/declarative/creation/tst_creation.cpp1
-rw-r--r--tests/benchmarks/declarative/declarative.pro1
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro2
-rw-r--r--tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro9
-rw-r--r--tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro1
-rw-r--r--tests/benchmarks/declarative/script/script.pro8
-rw-r--r--tests/benchmarks/declarative/script/tst_script.cpp1
9 files changed, 12 insertions, 16 deletions
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro
index 7fc0a23..c1a8223 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/declarative/binding/binding.pro
@@ -15,4 +15,3 @@ symbian {
# Define SRCDIR equal to test's source directory
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
-
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro
index a5df676..6540fa2 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/declarative/creation/creation.pro
@@ -6,10 +6,10 @@ macx:CONFIG -= app_bundle
SOURCES += tst_creation.cpp
-symbian* {
+symbian {
data.sources = data
data.path = .
DEPLOYMENT += data
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
-} \ No newline at end of file
+}
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index a253671..1c3332e 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -52,7 +52,6 @@
#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
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 54b2a45..5dd31f3 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
+
SUBDIRS += \
binding \
creation \
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
index 917040d..b2f39c1 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -7,7 +7,6 @@ macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
HEADERS += testtypes.h
-
symbian {
data.sources = data
data.path = .
@@ -16,4 +15,3 @@ symbian {
# Define SRCDIR equal to test's source directory
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
-
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
index bbe4e8d..a68792b 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
+++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -7,10 +7,11 @@ CONFIG += release
SOURCES += tst_qdeclarativeimage.cpp
-symbian* {
- data.sources = image.png
- data.path = .
- DEPLOYMENT += data
+symbian {
+ importFiles.sources = image.png
+ importFiles.path =
+ DEPLOYMENT = importFiles
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
+
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
index 1b72fc5..65ee7e0 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -14,4 +14,3 @@ symbian {
# Define SRCDIR equal to test's source directory
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
-
diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro
index 6255acc..685ba03 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/declarative/script/script.pro
@@ -7,10 +7,10 @@ CONFIG += release
SOURCES += tst_script.cpp
-symbian* {
- data.sources = data/*
- data.path = data
- DEPLOYMENT += data
+symbian {
+ importFiles.sources = data
+ importFiles.path =
+ DEPLOYMENT = importFiles
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index 8ea6dcd..99f294c 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -50,7 +50,6 @@
#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