Remove Symbian-specific code from tests.
authorJason McDonald <jason.mcdonald@nokia.com>
Wed, 28 Sep 2011 06:52:12 +0000 (16:52 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 30 Sep 2011 08:37:05 +0000 (10:37 +0200)
Symbian is not a supported platform for Qt5, so this code is no longer
required.

Change-Id: I5cb6d3b41fbb9fa5fea6176ad949e4e7be7c30b5
Reviewed-on: http://codereview.qt-project.org/5767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
220 files changed:
tests/auto/declarative/declarative.pro
tests/auto/declarative/parserstress/parserstress.pro
tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro
tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro
tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro
tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp
tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro
tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro
tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro
tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp
tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro
tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro
tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp
tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro
tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
tests/auto/declarative/qjsengine/qjsengine.pro
tests/auto/declarative/qjsengine/tst_qjsengine.cpp
tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro
tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
tests/auto/declarative/qsgborderimage/qsgborderimage.pro
tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
tests/auto/declarative/qsgflickable/qsgflickable.pro
tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp
tests/auto/declarative/qsgflipable/qsgflipable.pro
tests/auto/declarative/qsgflipable/tst_qsgflipable.cpp
tests/auto/declarative/qsgfocusscope/qsgfocusscope.pro
tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
tests/auto/declarative/qsggridview/qsggridview.pro
tests/auto/declarative/qsggridview/tst_qsggridview.cpp
tests/auto/declarative/qsgimage/qsgimage.pro
tests/auto/declarative/qsgimage/tst_qsgimage.cpp
tests/auto/declarative/qsgitem2/qsgitem.pro
tests/auto/declarative/qsgitem2/tst_qsgitem.cpp
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/declarative/qsglistview/tst_qsglistview.cpp
tests/auto/declarative/qsgloader/qsgloader.pro
tests/auto/declarative/qsgloader/tst_qsgloader.cpp
tests/auto/declarative/qsgmousearea/qsgmousearea.pro
tests/auto/declarative/qsgmousearea/tst_qsgmousearea.cpp
tests/auto/declarative/qsgpathview/qsgpathview.pro
tests/auto/declarative/qsgpathview/tst_qsgpathview.cpp
tests/auto/declarative/qsgpincharea/qsgpincharea.pro
tests/auto/declarative/qsgpincharea/tst_qsgpincharea.cpp
tests/auto/declarative/qsgpositioners/qsgpositioners.pro
tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp
tests/auto/declarative/qsgrepeater/qsgrepeater.pro
tests/auto/declarative/qsgrepeater/tst_qsgrepeater.cpp
tests/auto/declarative/qsgtext/qsgtext.pro
tests/auto/declarative/qsgtext/tst_qsgtext.cpp
tests/auto/declarative/qsgtextedit/qsgtextedit.pro
tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
tests/auto/declarative/qsgtextinput/qsgtextinput.pro
tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
tests/auto/declarative/qsgview/qsgview.pro
tests/auto/declarative/qsgview/tst_qsgview.cpp
tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
tests/auto/declarative/symbianlibs.pri [deleted file]
tests/auto/qtquick1/moduleqt47/moduleqt47.pro
tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp
tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro
tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro
tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro
tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro
tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp
tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro
tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro
tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro
tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro
tests/auto/qtquick1/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro
tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro
tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro
tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro
tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro
tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp
tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro
tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro
tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro
tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro
tests/auto/qtquick1/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro
tests/auto/qtquick1/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro
tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp
tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro
tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp
tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro
tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro
tests/auto/qtquick1/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro
tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp
tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro
tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp
tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro
tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro
tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro
tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro
tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro
tests/auto/qtquick1/qdeclarativetimer/tst_qdeclarativetimer.cpp
tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro
tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
tests/auto/qtquick1/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/binding/tst_binding.cpp
tests/benchmarks/declarative/compilation/compilation.pro
tests/benchmarks/declarative/compilation/tst_compilation.cpp
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/holistic/holistic.pro
tests/benchmarks/declarative/holistic/tst_holistic.cpp
tests/benchmarks/declarative/js/qjsengine/qjsengine.pro
tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
tests/benchmarks/declarative/qmltime/qmltime.cpp
tests/benchmarks/declarative/qmltime/qmltime.pro
tests/benchmarks/declarative/script/script.pro
tests/benchmarks/declarative/script/tst_script.cpp
tests/benchmarks/declarative/typeimports/tst_typeimports.cpp
tests/benchmarks/declarative/typeimports/typeimports.pro

index cb08922..52abb02 100644 (file)
@@ -82,9 +82,7 @@ SGTESTS =  \
 
 SUBDIRS += $$PUBLICTESTS
 
-!symbian: {
-    SUBDIRS += $$METATYPETESTS
-}
+SUBDIRS += $$METATYPETESTS
 
 contains(QT_CONFIG, private_tests) {
     SUBDIRS += $$PRIVATETESTS
index 4497767..a2e4479 100644 (file)
@@ -5,16 +5,8 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_parserstress.cpp
 
 !isEmpty(QT.script.sources) {
-    symbian: {
-        importFiles.files = $$QT.script.sources\\..\\..\\tests\\auto\\qscriptjstestsuite\\tests
-        importFiles.path = .
-        DEPLOYMENT += importFiles
-        DEFINES += TESTDATADIR=tests
-        DEFINES += SRCDIR=.
-    } else {
-        DEFINES += TESTDATADIR=\\\"$$QT.script.sources/../../tests/auto/qscriptjstestsuite/tests\\\"
-        DEFINES += SRCDIR=\\\"$$PWD\\\"
-    }
+    DEFINES += TESTDATADIR=\\\"$$QT.script.sources/../../tests/auto/qscriptjstestsuite/tests\\\"
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
 CONFIG += parallel_test
index 049e1b3..58ed934 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative opengl
 SOURCES += tst_qdeclarativeanimations.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 652e357..5650394 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeanimations : public QObject
 {
     Q_OBJECT
index 8ed7ee5..b347b1e 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative opengl
 SOURCES += tst_qdeclarativebehaviors.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test insignificant_test
 
index 0452da5..1314529 100644 (file)
 #include <private/qsgitem_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativebehaviors : public QObject
 {
     Q_OBJECT
index b2e5d2d..8bc8b6c 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativebinding.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d2581bc..1109e53 100644 (file)
 #include <private/qsgrectangle_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativebinding : public QObject
-
 {
     Q_OBJECT
 public:
index 1c9a3c0..a8fac10 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativechangeset.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 50d63fe..05a006b 100644 (file)
@@ -5,9 +5,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativecomponent.cpp 
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d983f9b..fe947fd 100644 (file)
 #include <QtDeclarative/qdeclarativeproperty.h>
 #include <qcolor.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativecomponent : public QObject
 {
     Q_OBJECT
index 7cd78ab..0fa1ebc 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeconnection.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index c726fde..fb0728c 100644 (file)
 #include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeconnection : public QObject
-
 {
     Q_OBJECT
 public:
index 54a8269..8fdd325 100644 (file)
@@ -3,9 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativecontext.cpp
 macx:CONFIG -= app_bundle
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 89d08e0..c241aca 100644 (file)
 #include <QDeclarativeComponent>
 #include <QDeclarativeExpression>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativecontext : public QObject
 {
     Q_OBJECT
index 52bfc49..0bdc876 100644 (file)
@@ -12,12 +12,6 @@ INCLUDEPATH += ../shared
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
-symbian {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-}
-
 OTHER_FILES =   data/test.qml \
                 data/test.js
 
index 981cad5..1c795f3 100644 (file)
@@ -12,13 +12,7 @@ INCLUDEPATH += ../shared
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index db0f52c..537965c 100644 (file)
 #include "testhttpserver.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 /*
 This test covers evaluation of ECMAScript expressions and bindings from within
 QML.  This does not include static QML language issues.
index 61ad24d..b601513 100644 (file)
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeengine.cpp 
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index e9bd735..6026cac 100644 (file)
 #include <QDeclarativeNetworkAccessManagerFactory>
 #include <QDeclarativeExpression>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeengine : public QObject
 {
     Q_OBJECT
index 4132abe..80a517d 100644 (file)
@@ -3,9 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeerror.cpp
 macx:CONFIG -= app_bundle
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 5d9f6d7..b05db9c 100644 (file)
 #include <QDeclarativeError>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeerror : public QObject
 {
     Q_OBJECT
index 8c73a7c..8659645 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeexpression.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index aa8c12e..200bf1a 100644 (file)
 #include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeexpression : public QObject
 {
     Q_OBJECT
index ad02dd4..4d878a3 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativefolderlistmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private declarative-private
index ef7738d..045b77d 100644 (file)
 #include <QtCore/qabstractitemmodel.h>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 // From qdeclarastivefolderlistmodel.h
 const int FileNameRole = Qt::UserRole+1;
 const int FilePathRole = Qt::UserRole+2;
index 946e5a8..758f446 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 29fe032..6d17c97 100644 (file)
 
 #define SERVER_PORT 14448
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativefontloader : public QObject
 {
     Q_OBJECT
index 6cb38e7..834a95c 100644 (file)
@@ -8,9 +8,7 @@ SOURCES += tst_qdeclarativeimageprovider.cpp
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 6ddc3bc..b359ba6 100644 (file)
 #include <QWaitCondition>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QDeclarativeImageProvider*);
 
 class tst_qdeclarativeimageprovider : public QObject
index ddca3d3..52fbef7 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeinfo.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index 71ff738..960b042 100644 (file)
 #include <QDeclarativeContext>
 #include <qdeclarativeinfo.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeinfo : public QObject
 {
     Q_OBJECT
index 7cff542..18f6d51 100644 (file)
@@ -3,9 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeinstruction.cpp
 macx:CONFIG -= app_bundle
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index fa860be..f1697ea 100644 (file)
 #include <qtest.h>
 #include <private/qdeclarativecompiler_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeinstruction : public QObject
 {
     Q_OBJECT
index e6006ae..0964cdf 100644 (file)
@@ -11,13 +11,7 @@ INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 SOURCES += ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private v8-private declarative-private
index 5e9bc41..425be1b 100644 (file)
 #include "../../../shared/util.h"
 #include "testhttpserver.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 DEFINE_BOOL_CONFIG_OPTION(qmlCheckTypes, QML_CHECK_TYPES)
 
-
 /*
 This test case covers QML language issues.  This covers everything that does not
 involve evaluating ECMAScript expressions and bindings.
index 4575c58..fbf02e2 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativelistmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0c3b75a..fe2cf9c 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QVariantHash>)
 
index ef22a55..b7a6a00 100644 (file)
@@ -3,9 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative widgets
 SOURCES += tst_qdeclarativemetatype.cpp
 macx:CONFIG -= app_bundle
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index afdc352..a85e73e 100644 (file)
 
 #include <private/qdeclarativemetatype_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativemetatype : public QObject
 {
     Q_OBJECT
index 1c94420..2183561 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index d4797a7..6d4f5fb 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index 2bf974a..61fab02 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index 52cf49d..f8b279c 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index 2c69f22..32e017e 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index b39f63e..1b496d6 100644 (file)
@@ -4,7 +4,4 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index 87cf7d6..5d21114 100644 (file)
@@ -5,7 +5,4 @@ QT = core declarative
 TARGET = Plugin
 DESTDIR = ../imports/com/nokia/WrongCase
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-}
 QT += core-private gui-private declarative-private
index 3b08229..d9df460 100644 (file)
@@ -74,11 +74,6 @@ private slots:
     void implicitQmldir_data();
 };
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define VERIFY_ERRORS(errorfile) \
     if (!errorfile) { \
         if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \
index b221626..efce8fa 100644 (file)
@@ -6,11 +6,6 @@ SOURCES = tst_qdeclarativemoduleplugin.cpp \
 QT += declarative network
 CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private declarative-private
index d6fe1cf..20c5b27 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativepath.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d8a539e..97bffcb 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarativePath : public QObject
 {
     Q_OBJECT
index 2231334..87b3151 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeproperty.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 75c2f7f..bc40535 100644 (file)
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     QFileInfo fileInfo(__FILE__);
index 69ebb8e..94d2332 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeqt.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
index d9cd2b8..9359030 100644 (file)
 #include <QSGItem>
 #include <QSignalSpy>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeqt : public QObject
 {
     Q_OBJECT
index cedb927..2f86a87 100644 (file)
@@ -8,13 +8,7 @@ INCLUDEPATH += ../shared
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 27d2c0c..3eaf140 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesmoothedanimation.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 243f4e7..6c851f0 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativesmoothedanimation : public QObject
 {
     Q_OBJECT
index 6394411..c37169f 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativespringanimation.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0c8ee5f..03d6ca4 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativespringanimation : public QObject
 {
     Q_OBJECT
index c22e8cc..9331693 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesqldatabase.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 7517bd3..a74a7a6 100644 (file)
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativesqldatabase : public QObject
 {
     Q_OBJECT
index 9935178..8022ef7 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativestates.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index f3b93ef..39dac6f 100644 (file)
 #include <private/qdeclarativeproperty_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class MyAttached : public QObject
 {
     Q_OBJECT
index bc801d6..879040c 100644 (file)
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesystempalette.cpp
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index 993536f..15251ec 100644 (file)
 #include <qpalette.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativesystempalette : public QObject
-
 {
     Q_OBJECT
 public:
index 3e0b355..66aba26 100644 (file)
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetimer.cpp
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private declarative-private
index 537c055..d6cf8c0 100644 (file)
 #include <QtDeclarative/qsgitem.h>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativetimer : public QObject
 {
     Q_OBJECT
@@ -85,12 +80,7 @@ public slots:
     }
 };
 
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-// Increase wait as emulator startup can cause unexpected delays
-#define TIMEOUT_TIMEOUT 2000
-#else
 #define TIMEOUT_TIMEOUT 200
-#endif
 
 tst_qdeclarativetimer::tst_qdeclarativetimer()
 {
index b6f0df2..0a30d0c 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativetranslation.cpp
 RESOURCES += data/translation.qrc
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 4f47b80..5fbfd47 100644 (file)
 #include <QDeclarativeComponent>
 #include <QTranslator>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativetranslation : public QObject
 {
     Q_OBJECT
index 0701d95..fa9737f 100644 (file)
@@ -6,13 +6,7 @@ SOURCES += tst_qdeclarativev4.cpp \
            testtypes.cpp 
 HEADERS += testtypes.h 
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 79bac39..2b1942c 100644 (file)
@@ -7,13 +7,7 @@ HEADERS += testtypes.h
 SOURCES += tst_qdeclarativevaluetypes.cpp \
            testtypes.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 3ccd5cb..d0e997e 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include "testtypes.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 QT_BEGIN_NAMESPACE
 extern int qt_defaultDpi();
 QT_END_NAMESPACE
index aae48ca..31013f5 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeworkerscript.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 5e67360..6a0586e 100644 (file)
 #include <private/qdeclarativeengine_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     QFileInfo fileInfo(__FILE__);
index 441a9cf..fa4f678 100644 (file)
@@ -8,13 +8,7 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativexmlhttprequest.cpp \
            ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 51b23c7..2c9bcc0 100644 (file)
 
 #define SERVER_PORT 14445
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativexmlhttprequest : public QObject
 {
     Q_OBJECT
index 6733d35..0c15299 100644 (file)
@@ -8,13 +8,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativexmllistmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 2a1d716..252aea7 100644 (file)
 #include <private/qdeclarativexmllistmodel_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 typedef QPair<int, int> QDeclarativeXmlListRange;
 typedef QList<QVariantList> QDeclarativeXmlModelData;
 
index 10d75b4..0a12e22 100644 (file)
@@ -5,18 +5,10 @@ SOURCES += tst_qjsengine.cpp
 #temporary
 CONFIG += insignificant_test
 wince* {
+    addFiles.files = script
+    addFiles.path = .
+    DEPLOYMENT += addFiles
     DEFINES += SRCDIR=\\\"./\\\"
-} else:!symbian {
+} else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
-wince*|symbian: {
-   addFiles.files = script
-   addFiles.path = .
-   DEPLOYMENT += addFiles
-}
-
-symbian: {
-   TARGET.UID3 = 0xE0340006
-   DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
-}
index c6f026d..6907fb0 100644 (file)
@@ -55,12 +55,6 @@ Q_DECLARE_METATYPE(QObjectList)
 //TESTED_CLASS=
 //TESTED_FILES=
 
-#if defined(Q_OS_SYMBIAN)
-# define STRINGIFY(x) #x
-# define TOSTRING(x) STRINGIFY(x)
-# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID)
-#endif
-
 // The JavaScriptCore GC marks the C stack. To try to ensure that there is
 // no JSObject* left in stack memory by the compiler, we call this function
 // to zap some bytes of memory before calling collectGarbage().
index 5da2ba9..ae0eb0c 100644 (file)
@@ -4,13 +4,7 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qsganimatedimage.cpp ../shared/testhttpserver.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0c927c2..4f2e90b 100644 (file)
 #include "../shared/testhttpserver.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qsganimatedimage : public QObject
 {
     Q_OBJECT
index 5a68e67..c6101ef 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qsgborderimage.cpp ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d1fe084..9f390ae 100644 (file)
 #include "../shared/testhttpserver.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define SERVER_PORT 14446
 #define SERVER_ADDR "http://127.0.0.1:14446"
 
index 61197df..36166a2 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgflickable.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index 554be23..12c2e9c 100644 (file)
 #include "../../../shared/util.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qsgflickable : public QObject
 {
     Q_OBJECT
index e28de1b..91488b9 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgflipable.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index bd2090d..3d53f12 100644 (file)
 #include <math.h>
 #include <QtOpenGL/QGLShaderProgram>
 
-
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qsgflipable : public QObject
 {
     Q_OBJECT
index 375b497..b07b1cb 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qsgfocusscope.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private declarative-private
 
index a21eeff..144d01f 100644 (file)
 #include "../../../shared/util.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qsgfocusscope : public QObject
 {
     Q_OBJECT
index e093813..35c4f6f 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsggridview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index 2624a48..6ec5378 100644 (file)
 #include "../../../shared/util.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(Qt::LayoutDirection)
 Q_DECLARE_METATYPE(QSGGridView::Flow)
 
index e7f3dfa..704cfb9 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qsgimage.cpp ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index ccea5ca..181ad0e 100644 (file)
 #include "../../../shared/util.h"
 #include "../shared/testhttpserver.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define SERVER_PORT 14451
 #define SERVER_ADDR "http://127.0.0.1:14451"
 
index aa2528f..ae8413e 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgitem.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 4250708..c4b25a4 100644 (file)
 #include <private/qsgitem_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QSGItem : public QObject
-
 {
     Q_OBJECT
 public:
index 4c78188..2c35d29 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += incrementalmodel.h
 SOURCES += tst_qsglistview.cpp incrementalmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private declarative-private widgets widgets-private v8-private
index 0ea5d45..9642b8f 100644 (file)
 #include "incrementalmodel.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(Qt::LayoutDirection)
 Q_DECLARE_METATYPE(QSGListView::Orientation)
 
index 22752df..24b597d 100644 (file)
@@ -7,13 +7,7 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qsgloader.cpp \
            ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index daf9e2a..cd47925 100644 (file)
 
 #define SERVER_PORT 14450
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
index f0179e8..26f5413 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qsgmousearea.cpp ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 035c910..20bf5d9 100644 (file)
 #include <QtOpenGL/QGLShaderProgram>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 //#define OLDWAY
 
 class tst_QSGMouseArea: public QObject
index a9b3838..52d670e 100644 (file)
@@ -3,13 +3,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgpathview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test 
 #temporary
index f21cc08..70c7f41 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 static void initStandardTreeModel(QStandardItemModel *model)
 {
     QStandardItem *item;
index cf1ff0c..078baeb 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgpincharea.cpp
 
-symbian: {
-    importFiles.sources = data
-    importFiles.path = .
-    DEPLOYMENT = importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d71c999..6411fa6 100644 (file)
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QSGPinchArea: public QObject
 {
     Q_OBJECT
index 637ba9b..5a365a1 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qsgpositioners.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 #temporary
index 2ea8205..657190c 100644 (file)
 #include <QtWidgets/qgraphicswidget.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qsgpositioners : public QObject
 {
     Q_OBJECT
index 9c28917..f6ef6e8 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgrepeater.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private declarative-private
index 9eb8813..7143ff8 100644 (file)
 #include <private/qsgrepeater_p.h>
 #include <private/qsgtext_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
index a13f8f9..8e0f83e 100644 (file)
@@ -9,13 +9,7 @@ INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 SOURCES += ../shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 5a27a69..d311116 100644 (file)
 #include "testhttpserver.h"
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
 class tst_qsgtext : public QObject
-
 {
     Q_OBJECT
 public:
index 1048e49..ef4c4e2 100644 (file)
@@ -5,13 +5,8 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qsgtextedit.cpp ../shared/testhttpserver.cpp
 HEADERS += ../shared/testhttpserver.h
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private v8-private declarative-private
 QT += opengl-private
 
index ffb8188..f72a028 100644 (file)
 #include <Carbon/Carbon.h>
 #endif
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define QTBUG_21691
 #define QTBUG_21691_MESSAGE "QTBUG-21691: The test needs to be rewritten to not use QInputContext"
 
@@ -2226,7 +2221,7 @@ void tst_qsgtextedit::preeditMicroFocus()
     ic.sendPreeditText(preeditText, 0);
     currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, false); // The cursor position hasn't changed.
 #endif
     QCOMPARE(cursorRectangleSpy.count(), 0);
@@ -2238,7 +2233,7 @@ void tst_qsgtextedit::preeditMicroFocus()
         ic.sendPreeditText(preeditText, i);
         currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect();
         QVERIFY(previousRect.left() < currentRect.left());
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
         QCOMPARE(ic.updateReceived, true);
 #endif
         QVERIFY(cursorRectangleSpy.count() > 0);
@@ -2253,7 +2248,7 @@ void tst_qsgtextedit::preeditMicroFocus()
     ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
     currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
     QVERIFY(cursorRectangleSpy.count() > 0);
index fceef18..7985219 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgtextinput.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private v8-private declarative-private
 QT += opengl-private
index 35e0e91..83ad180 100644 (file)
 
 #include "qplatformdefs.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QSGTextInput::SelectionMode)
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
@@ -2393,7 +2388,7 @@ void tst_qsgtextinput::preeditMicroFocus()
     ic.sendPreeditText(preeditText, 0);
     currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
 
@@ -2404,7 +2399,7 @@ void tst_qsgtextinput::preeditMicroFocus()
         ic.sendPreeditText(preeditText, i);
         currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect();
         QVERIFY(previousRect.left() < currentRect.left());
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
         QCOMPARE(ic.updateReceived, true);
 #endif
         previousRect = currentRect;
@@ -2417,7 +2412,7 @@ void tst_qsgtextinput::preeditMicroFocus()
     ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
     currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
 #endif
index e6cb078..f47eed1 100644 (file)
@@ -4,11 +4,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private declarative-private
index 1e2e063..e315d9e 100644 (file)
 #include "../../../shared/util.h"
 #include <QtGui/QWindow>
 #include <QtCore/QDebug>
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
 
 class tst_QSGView : public QObject
-
 {
     Q_OBJECT
 public:
index 3104706..6a999d8 100644 (file)
@@ -3,13 +3,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgvisualdatamodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index bd17deb..824b623 100644 (file)
 #include <math.h>
 #include <QtOpenGL/QGLShaderProgram>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 static void initStandardTreeModel(QStandardItemModel *model)
 {
     QStandardItem *item;
diff --git a/tests/auto/declarative/symbianlibs.pri b/tests/auto/declarative/symbianlibs.pri
deleted file mode 100644 (file)
index 4452f67..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#additional libs required for orientation sensor
-symbian {
-    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
-        LIBS += -lsensrvclient -lsensrvutil
-    }
-    contains(QT_CONFIG, s60): {
-        LIBS += -lavkon -lcone
-    }
-}
index f58c96f..04f7df5 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_moduleqt47.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0e2490a..18efc4a 100644 (file)
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_moduleqt47 : public QObject
 {
     Q_OBJECT
index 0c3e1cf..95ea356 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative qtquick1
 SOURCES += tst_qdeclarativeanchors.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 7aef248..0c163e7 100644 (file)
 #include <QtQuick1/private/qdeclarativeanchors_p_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QDeclarative1Anchors::Anchor)
 Q_DECLARE_METATYPE(QDeclarative1AnchorLine::AnchorLine)
 
index 5e34dd6..85e9f83 100644 (file)
@@ -4,13 +4,7 @@ HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativeanimatedimage.cpp ../../declarative/shared/testhttpserver.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 1d2f5ad..09d1980 100644 (file)
 #include "../../declarative/shared/testhttpserver.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeanimatedimage : public QObject
 {
     Q_OBJECT
index ad217c4..895c1d4 100644 (file)
@@ -2,15 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative qtquick1
 SOURCES += tst_qdeclarativeanimations.cpp
 macx:CONFIG -= app_bundle
-
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
-
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private
index 53e5502..b523b09 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeanimations : public QObject
 {
     Q_OBJECT
index 4d76160..4ca2615 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative qtquick1
 SOURCES += tst_qdeclarativebehaviors.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test insignificant_test
 
index 773fc24..3cff254 100644 (file)
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativebehaviors : public QObject
 {
     Q_OBJECT
index af82548..345f900 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativebinding.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 54ff801..9516aeb 100644 (file)
 #include <QtQuick1/private/qdeclarativerectangle_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativebinding : public QObject
-
 {
     Q_OBJECT
 public:
index 2a5f79d..c1a49b2 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativeborderimage.cpp ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 9ef2aae..b2a84e8 100644 (file)
 #include "../../declarative/shared/testhttpserver.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define SERVER_PORT 14446
 #define SERVER_ADDR "http://127.0.0.1:14446"
 
index 405969b..73f9f13 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeconnection.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 96e2957..f23d5bc 100644 (file)
 #include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeconnection : public QObject
-
 {
     Q_OBJECT
 public:
index ea3144a..7928994 100644 (file)
@@ -1,16 +1,10 @@
-load(qttest_p4)
+oad(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui qtquick1
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeflickable.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 2d8c75b..8e7f9ca 100644 (file)
 #include <math.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeflickable : public QObject
 {
     Q_OBJECT
index d982b99..13cf515 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeflipable.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 60d7125..e32f6fa 100644 (file)
 #include <QtQuick1/private/qdeclarativerectangle_p.h>
 #include <math.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativeflipable : public QObject
 {
     Q_OBJECT
index 78123ab..885f90b 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative qtquick1
 SOURCES += tst_qdeclarativefocusscope.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private widgets-private declarative-private qtquick1-private
 qpa:CONFIG+=insignificant_test  # QTBUG-21013 unstable
index 9a80525..656a095 100644 (file)
 #include <QtQuick1/private/qdeclarativefocusscope_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativefocusscope : public QObject
 {
     Q_OBJECT
index 0940239..a9d84ae 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index cfd3087..12ca221 100644 (file)
 
 #define SERVER_PORT 14448
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativefontloader : public QObject
 {
     Q_OBJECT
index 2d2075b..baf3ce9 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativegridview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index c370a01..ea5cc2e 100644 (file)
 #include <QtQuick1/private/qdeclarativetext_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarative1GridView : public QObject
 {
     Q_OBJECT
index b50241c..20b4abf 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativeimage.cpp ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index cd07b00..fdfbbb1 100644 (file)
 #include "../../../shared/util.h"
 #include "../../declarative/shared/testhttpserver.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 #define SERVER_PORT 14451
 #define SERVER_ADDR "http://127.0.0.1:14451"
 
index 74d9e8a..3eb4305 100644 (file)
@@ -8,9 +8,7 @@ SOURCES += tst_qdeclarativeimageprovider.cpp
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 3190579..91c61f0 100644 (file)
 #include <QWaitCondition>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QDeclarativeImageProvider*);
 
 class tst_qdeclarativeimageprovider : public QObject
index 0515e56..cdb7913 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeitem.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 5b71f23..ea84051 100644 (file)
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarativeItem : public QObject
-
 {
     Q_OBJECT
 public:
index 29b0380..88c0575 100644 (file)
@@ -4,11 +4,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativelayoutitem.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private widgets-private declarative-private qtquick1-private
index 095ad2b..8ea61dc 100644 (file)
 #include <qgraphicslinearlayout.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativelayoutitem : public QObject
 {
     Q_OBJECT
index 799b48a..a7b5ba0 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativelistmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index a67c7c3..4b3d3a6 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QVariantHash>)
 
index 6adac21..6495c7e 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += incrementalmodel.h
 SOURCES += tst_qdeclarativelistview.cpp incrementalmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private
index c9cce3d..5d1eb39 100644 (file)
 #include "../../../shared/util.h"
 #include "incrementalmodel.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarative1ListView : public QObject
 {
     Q_OBJECT
index c2d0fe6..0082d00 100644 (file)
@@ -7,13 +7,7 @@ HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativeloader.cpp \
            ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index e73f9e0..f23ce3f 100644 (file)
 
 #define SERVER_PORT 14450
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
index 1739908..b069887 100644 (file)
@@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += tst_qdeclarativemousearea.cpp ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index a840710..fc6a26d 100644 (file)
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativeproperty.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarative1MouseArea: public QObject
 {
     Q_OBJECT
index e968467..7f8d382 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeparticles.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index a321c28..c4186f4 100644 (file)
 #include <QtQuick1/qdeclarativeview.h>
 #include <QGraphicsObject>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarativeParticles : public QObject
 {
     Q_OBJECT
index d72d3f3..12ca9e9 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativepathview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 194d421..69c8956 100644 (file)
 
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 static void initStandardTreeModel(QStandardItemModel *model)
 {
     QStandardItem *item;
index 7079de3..9cc0a8e 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativepincharea.cpp
 
-symbian: {
-    importFiles.sources = data
-    importFiles.path = .
-    DEPLOYMENT = importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index e48bad3..a1e27ea 100644 (file)
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarative1PinchArea: public QObject
 {
     Q_OBJECT
index b5772ee..e661342 100644 (file)
@@ -3,13 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative qtquick1
 SOURCES += tst_qdeclarativepositioners.cpp
 macx:CONFIG -= app_bundle
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 32eba61..28a3c69 100644 (file)
 #include <QtWidgets/qgraphicswidget.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarativePositioners : public QObject
 {
     Q_OBJECT
index 03bfdd8..cd55ab0 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativerepeater.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private widgets-private declarative-private qtquick1-private
index de9ed67..95f5dd2 100644 (file)
 #include <QtQuick1/private/qdeclarativerepeater_p.h>
 #include <QtQuick1/private/qdeclarativetext_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
index 873e15f..e90d839 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesmoothedanimation.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0b1c46d..1d1a811 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativesmoothedanimation : public QObject
 {
     Q_OBJECT
index 327765d..17abe1f 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativespringanimation.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 8c22f97..51137fa 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativespringanimation : public QObject
 {
     Q_OBJECT
index ede4e8c..fc9d0c8 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativestates.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private
index 8da3abf..809d9ca 100644 (file)
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include <private/qdeclarativeproperty_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class MyAttached : public QObject
 {
     Q_OBJECT
index 33effc7..9bdc7d4 100644 (file)
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesystempalette.cpp
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 0c44e9f..4738160 100644 (file)
 #include <qpalette.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativesystempalette : public QObject
-
 {
     Q_OBJECT
 public:
index 63dfc49..509ba20 100644 (file)
@@ -9,13 +9,7 @@ INCLUDEPATH += ../../declarative/shared/
 HEADERS += ../../declarative/shared/testhttpserver.h
 SOURCES += ../../declarative/shared/testhttpserver.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 801d631..cefc7a2 100644 (file)
 #include "../../../shared/util.h"
 #include "testhttpserver.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativetext : public QObject
-
 {
     Q_OBJECT
 public:
index 7eb558a..38ccff3 100644 (file)
@@ -5,11 +5,6 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativetextedit.cpp ../../declarative/shared/testhttpserver.cpp
 HEADERS += ../../declarative/shared/testhttpserver.h
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private
index ec48769..45402f1 100644 (file)
 #include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h>
 #include <private/qtextcontrol_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QDeclarative1TextEdit::SelectionMode)
 
 QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual)
@@ -2449,7 +2444,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus()
     ic.sendPreeditText(preeditText, 0);
     currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, false); // The cursor position hasn't changed.
 #endif
     QCOMPARE(cursorRectangleSpy.count(), 0);
@@ -2461,7 +2456,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus()
         ic.sendPreeditText(preeditText, i);
         currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
         QVERIFY(previousRect.left() < currentRect.left());
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
         QCOMPARE(ic.updateReceived, true);
 #endif
         QVERIFY(cursorRectangleSpy.count() > 0);
@@ -2476,7 +2471,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus()
     ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
     currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
     QVERIFY(cursorRectangleSpy.count() > 0);
index 213c4d6..0518451 100644 (file)
@@ -4,12 +4,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetextinput.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private
index 55c431f..76aa040 100644 (file)
 
 #include "qplatformdefs.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QDeclarative1TextInput::SelectionMode)
 
 QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual)
@@ -2628,7 +2623,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus()
     ic.sendPreeditText(preeditText, 0);
     currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
 
@@ -2639,7 +2634,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus()
         ic.sendPreeditText(preeditText, i);
         currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
         QVERIFY(previousRect.left() < currentRect.left());
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
         QCOMPARE(ic.updateReceived, true);
 #endif
         previousRect = currentRect;
@@ -2652,7 +2647,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus()
     ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
     currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
     QCOMPARE(currentRect, previousRect);
-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS)
     QCOMPARE(ic.updateReceived, true);
 #endif
 }
index d0639dc..209964c 100644 (file)
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetimer.cpp
 
-!symbian: {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 QT += core-private gui-private widgets-private declarative-private qtquick1-private
index 8b1b79a..4af4585 100644 (file)
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qdeclarativetimer : public QObject
 {
     Q_OBJECT
@@ -85,12 +80,7 @@ public slots:
     }
 };
 
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-// Increase wait as emulator startup can cause unexpected delays
-#define TIMEOUT_TIMEOUT 2000
-#else
 #define TIMEOUT_TIMEOUT 200
-#endif
 
 tst_qdeclarativetimer::tst_qdeclarativetimer()
 {
index c81a4a7..fd9af63 100644 (file)
@@ -4,11 +4,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeview.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets
index 9b844de..019810a 100644 (file)
 #include <QtWidgets/qgraphicswidget.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_QDeclarativeView : public QObject
-
 {
     Q_OBJECT
 public:
index 433eaf8..5f96dac 100644 (file)
@@ -6,14 +6,7 @@ include(../../../../tools/qmlviewer/qml.pri)
 
 SOURCES += tst_qdeclarativeviewer.cpp
 
-symbian: {
-    include(../symbianlibs.pri)
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test insignificant_test
 QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets-private v8-private
index e6bd2d0..6db8b4f 100644 (file)
 #include "deviceorientation.h"
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
-#if defined(Q_OS_MAC) || defined(Q_WS_MAEMO_5) || defined(Q_WS_S60)
+#if defined(Q_OS_MAC) || defined(Q_WS_MAEMO_5)
 #  define MENUBAR_HEIGHT(mw) 0
 #else
 #  define MENUBAR_HEIGHT(mw) (mw->menuBar()->height())
index 0f7eec3..7dd1fe3 100644 (file)
@@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativevisualdatamodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index d08251e..2d849a8 100644 (file)
 #include <private/qdeclarativevaluetype_p.h>
 #include <math.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 static void initStandardTreeModel(QStandardItemModel *model)
 {
     QStandardItem *item;
index cb7b543..7a55d7a 100644 (file)
@@ -8,13 +8,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativexmllistmodel.cpp
 
-symbian: {
-    importFiles.files = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
index 35a78e0..6a919a1 100644 (file)
 #include <QtQuick1/private/qdeclarativexmllistmodel_p.h>
 #include "../../../shared/util.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 typedef QPair<int, int> QDeclarativeXmlListRange;
 typedef QList<QVariantList> QDeclarativeXmlModelData;
 
index bbe8701..c9567d3 100644 (file)
@@ -7,11 +7,5 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_binding.cpp testtypes.cpp
 HEADERS += testtypes.h
 
-symbian {
-    data.files = data
-    data.path = .
-    DEPLOYMENT += data
-} else {
-    # Define SRCDIR equal to test's source directory
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index 70796f6..c1b5035 100644 (file)
 
 //TESTED_FILES=
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_binding : public QObject
 {
     Q_OBJECT
index 9ab2a25..32f4aba 100644 (file)
@@ -8,10 +8,4 @@ CONFIG += release
 
 SOURCES += tst_compilation.cpp
 
-symbian {
-  data.files += data
-  data.path = .
-  DEPLOYMENT += data
-} else {
-  DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index 9b4f9a7..1720043 100644 (file)
 #include <QDebug>
 #include <QTextStream>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_compilation : public QObject
 {
     Q_OBJECT
index 4d6cafb..a93eab8 100644 (file)
@@ -6,12 +6,6 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_creation.cpp
 
-symbian {
-    data.files = data
-    data.path = .
-    DEPLOYMENT += data
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private declarative-private qtquick1-private
index 2ccdcb4..70099f6 100644 (file)
 #include <QtQuick1/private/qdeclarativetextinput_p.h>
 #include <private/qobject_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_creation : public QObject
 {
     Q_OBJECT
index fadb04d..4be45f5 100644 (file)
@@ -10,10 +10,4 @@ SOURCES += tst_holistic.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
-symbian {
-  data.files += data
-  data.path = .
-  DEPLOYMENT += data
-} else {
-  DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index 102a91c..88c7d52 100644 (file)
 #include <QFile>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 // Conceptually, there are several different "holistic" areas to benchmark:
 // 1) Loading
 //     - read file from disk
index cbd128b..b829618 100644 (file)
@@ -5,8 +5,3 @@ TARGET = tst_bench_qjsengine
 SOURCES += tst_qjsengine.cpp
 
 QT += declarative
-
-symbian* {
-    TARGET.EPOCHEAPSIZE  = 0x20000 0x2000000 // Min 128kB, Max 32MB
-    TARGET.EPOCSTACKSIZE = 0x14000
-}
index f8bade3..da5788e 100644 (file)
@@ -540,13 +540,8 @@ void tst_QJSEngine::nativeCall()
     newEngine();
     m_engine->globalObject().setProperty("fun", m_engine->newFunction(native_function));
     QBENCHMARK{
-#if !defined(Q_OS_SYMBIAN)
         m_engine->evaluate("var w = 0; for (i = 0; i < 100000; ++i) {\n"
                      "  w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#else
-        m_engine->evaluate("var w = 0; for (i = 0; i < 25000; ++i) {\n"
-                     "  w += fun() + fun(); w -= fun(); fun(); w -= fun(); }");
-#endif
     }
 }
 
index 4693a82..da5765a 100644 (file)
@@ -7,11 +7,5 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
 HEADERS += testtypes.h
 
-symbian {
-    data.files = data
-    data.path = .
-    DEPLOYMENT += data
-} else {
-    # Define SRCDIR equal to test's source directory
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index 94b0967..1ff3e2d 100644 (file)
 
 //TESTED_FILES=
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qmlcomponent : public QObject
 {
     Q_OBJECT
index 0d7c184..71dfdf3 100644 (file)
@@ -7,11 +7,5 @@ CONFIG += release
 
 SOURCES += tst_qdeclarativeimage.cpp
 
-symbian {
-    importFiles.files = image.png
-    importFiles.path = 
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
index 74bb35b..2aade96 100644 (file)
 #include <QDeclarativeComponent>
 #include <private/qdeclarativeimage_p.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qmlgraphicsimage : public QObject
 {
     Q_OBJECT
index 765e37a..79fdd26 100644 (file)
@@ -6,11 +6,5 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativemetaproperty.cpp 
 
-symbian {
-  data.files += data
-  data.path = .
-  DEPLOYMENT += data
-} else {
-  # Define SRCDIR equal to test's source directory
-  DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index ff18aa4..05dd46a 100644 (file)
 
 //TESTED_FILES=
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_qmlmetaproperty : public QObject
 {
     Q_OBJECT
index d5a3c5a..4e7ef3a 100644 (file)
@@ -247,11 +247,7 @@ int main(int argc, char ** argv)
     }
 
     if (filename.isEmpty())
-#ifdef Q_OS_SYMBIAN
-        filename = QLatin1String("./tests/item_creation/data.qml");
-#else
         usage(argv[0]);
-#endif
 
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, filename);
@@ -272,9 +268,6 @@ int main(int argc, char ** argv)
         return -1;
     }
 
-#ifdef Q_OS_SYMBIAN
-    willParent = true;
-#endif
     timer->setWillParent(willParent);
 
     if (!timer->component()) {
@@ -282,10 +275,6 @@ int main(int argc, char ** argv)
         return -1;
     }
 
-#ifdef Q_OS_SYMBIAN
-    iterations = 1024;
-#endif
-
     timer->run(iterations);
 
     return 0;
index 273a60a..b077d1a 100644 (file)
@@ -6,10 +6,3 @@ macx:CONFIG -= app_bundle
 
 SOURCES += qmltime.cpp 
 
-symbian {
-    TARGET.CAPABILITY = "All -TCB"
-    example.files = example.qml tests
-    example.path = .
-    DEPLOYMENT += example
-}
-
index 01df571..71d4485 100644 (file)
@@ -7,14 +7,4 @@ CONFIG += release
 
 SOURCES += tst_script.cpp
 
-symbian {
-    importFiles.files = data
-    importFiles.path =
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
-
-
-
-
+DEFINES += SRCDIR=\\\"$$PWD\\\"
index 4321b09..1ac5131 100644 (file)
 #include <QScriptEngine>
 #include <QScriptValue>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_script : public QObject
 {
     Q_OBJECT
index 16b54b5..caa1777 100644 (file)
 #include <QDeclarativeComponent>
 #include <QDebug>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 class tst_typeimports : public QObject
 {
     Q_OBJECT
index 56834e6..c18cbed 100644 (file)
@@ -6,10 +6,4 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_typeimports.cpp
 
-symbian {
-    data.files = data
-    data.path = .
-    DEPLOYMENT += data
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
\ No newline at end of file
+DEFINES += SRCDIR=\\\"$$PWD\\\"