diff options
58 files changed, 81 insertions, 65 deletions
diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index d53c11cedc..319ba9be4e 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -6,7 +6,7 @@ QT -= gui include (../xmlpatterns.pri) -wince*|symbian*: { +wince*|symbian: { QT += network addFiles.sources = \ $$QT_SOURCE_TREE/examples/sql/masterdetail/albumdetails.xml \ diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 259be4cacd..531fed25bb 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -101,3 +101,10 @@ SUBDIRS=\ selftests \ utf8 \ +symbian:SUBDIRS -= \ + qtconcurrentfilter \ + qtconcurrentiteratekernel \ + qtconcurrentmap \ + qtconcurrentrun \ + qtconcurrentthreadengine \ + diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index a8fd2b40fb..cfaa3fa0bf 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -220,3 +220,11 @@ win32:SUBDIRS -= qtextpiecetable qstylesheetstyle \ qtextpiecetable \ +symbian:SUBDIRS -= \ + qhelpcontentmodel \ + qhelpenginecore \ + qhelpgenerator \ + qhelpindexmodel \ + qhelpprojectdata \ + qsystemtrayicon \ + diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro index bef2fe9d36..e887df427d 100755 --- a/tests/auto/mediaobject/mediaobject.pro +++ b/tests/auto/mediaobject/mediaobject.pro @@ -14,7 +14,7 @@ wince*{ DEFINES += tst_MediaObject=tst_MediaObject_waveout } -symbian*:{ +symbian:{ addFiles.sources = media/test.sdp addFiles.path = media DEPLOYMENT += addFiles diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro index b0d537a7cd..d7cb7f33c0 100644 --- a/tests/auto/networkselftest/networkselftest.pro +++ b/tests/auto/networkselftest/networkselftest.pro @@ -8,7 +8,7 @@ wince*: { addFiles.path = . DEPLOYMENT = addFiles DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { +} else:symbian { addFiles.sources = rfc3252.txt addFiles.path = . DEPLOYMENT = addFiles diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro index c528c93cba..f83e0aab39 100644 --- a/tests/auto/patternistexamples/patternistexamples.pro +++ b/tests/auto/patternistexamples/patternistexamples.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_patternistexamples.cpp CONFIG += qtestlib -wince*|symbian*: { +wince*|symbian: { snippets.sources = $$QT_SOURCE_TREE/doc/src/snippets/patternist/* snippets.path = patternist widgetRen.sources = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/widgetRenderer/* diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro index e8b1ce95ef..3193764709 100644 --- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro @@ -3,11 +3,12 @@ ###################################################################### TEMPLATE = app -!symbian*: { +!symbian: { DEPENDPATH += . INCLUDEPATH += . } -wince*|symbian*:TARGET = ../desktopsettingsaware +wince*:TARGET = ../desktopsettingsaware +symbian:TARGET = desktopsettingsaware # Input SOURCES += main.cpp diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro index e68af26be5..30eb75177a 100644 --- a/tests/auto/qapplication/test/test.pro +++ b/tests/auto/qapplication/test/test.pro @@ -11,7 +11,7 @@ wince* { DEPLOYMENT = additional deploy someTest } -symbian*: { +symbian: { additional.sources = ../desktopsettingsaware/desktopsettingsaware.exe additional.path = desktopsettingsaware someTest.sources = test.pro diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro index a6286ecf61..e1734e0b07 100644 --- a/tests/auto/qaudiooutput/qaudiooutput.pro +++ b/tests/auto/qaudiooutput/qaudiooutput.pro @@ -4,7 +4,7 @@ SOURCES += tst_qaudiooutput.cpp QT = core multimedia -wince*|symbian*: { +wince*|symbian: { deploy.sources += 4.wav DEPLOYMENT = deploy !symbian { diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro index a534d148ab..3813e4e3f2 100644 --- a/tests/auto/qchar/qchar.pro +++ b/tests/auto/qchar/qchar.pro @@ -3,12 +3,12 @@ SOURCES += tst_qchar.cpp QT = core -wince*|symbian*: { +wince*|symbian: { deploy.sources += NormalizationTest.txt DEPLOYMENT = deploy } -symbian*: { +symbian: { DEFINES += SRCDIR="" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qclipboard/test/test.pro b/tests/auto/qclipboard/test/test.pro index 62a38afa5d..0f8cad1792 100644 --- a/tests/auto/qclipboard/test/test.pro +++ b/tests/auto/qclipboard/test/test.pro @@ -10,13 +10,13 @@ win32 { } } -wince*|symbian*: { +wince*|symbian: { copier.sources = ../copier/copier.exe copier.path = copier paster.sources = ../paster/paster.exe paster.path = paster - symbian*: { + symbian: { load(data_caging_paths) rsc.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/copier.rsc rsc.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/paster.rsc diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro index aa9a7c49fd..7e1a866bc3 100644 --- a/tests/auto/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/qcryptographichash/qcryptographichash.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qcryptographichash.cpp QT = core -symbian*: { +symbian: { TARGET.EPOCSTACKSIZE =0x5000 -TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" +TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro index ece886cbcb..d60b52d911 100644 --- a/tests/auto/qdiriterator/qdiriterator.pro +++ b/tests/auto/qdiriterator/qdiriterator.pro @@ -3,7 +3,7 @@ SOURCES += tst_qdiriterator.cpp RESOURCES += qdiriterator.qrc QT = core -wince*|symbian*: { +wince*|symbian: { addFiles.sources = entrylist recursiveDirs foo addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro index 61914b5047..5434ada4d8 100644 --- a/tests/auto/qdom/qdom.pro +++ b/tests/auto/qdom/qdom.pro @@ -4,7 +4,7 @@ SOURCES += tst_qdom.cpp QT = core xml QT -= gui -wince*|symbian*: { +wince*|symbian: { addFiles.sources = testdata doubleNamespaces.xml umlaut.xml addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qfile/qfile.pro b/tests/auto/qfile/qfile.pro index 33fd2fd7c0..0383e30f04 100644 --- a/tests/auto/qfile/qfile.pro +++ b/tests/auto/qfile/qfile.pro @@ -5,5 +5,5 @@ wince*:{ SUBDIRS = test stdinprocess } -!symbian*:SUBDIRS += largefile +!symbian:SUBDIRS += largefile diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index 20385142c1..ef5ed22a30 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -6,7 +6,7 @@ QT = core RESOURCES += qfileinfo.qrc -wince*:|symbian*: { +wince*:|symbian: { deploy.sources += qfileinfo.qrc tst_qfileinfo.cpp res.sources = resources\\file1 resources\\file1.ext1 resources\\file1.ext1.ext2 res.path = resources diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro index 33d479aa56..9618962b44 100644 --- a/tests/auto/qftp/qftp.pro +++ b/tests/auto/qftp/qftp.pro @@ -9,7 +9,7 @@ wince*: { addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { +} else:symbian { addFiles.sources = rfc3252.txt addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 401c9ebfc6..cc6f585978 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -6,7 +6,7 @@ win32:!wince*: LIBS += -lUser32 !wince*:!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_NO_CAST_TO_ASCII -wince*|symbian*: { +wince*|symbian: { rootFiles.sources = Ash_European.jpg graphicsScene_selection.data rootFiles.path = . renderFiles.sources = testData\\render\\* @@ -17,4 +17,4 @@ wince*:{ DEFINES += SRCDIR=\\\".\\\" } -symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" +symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # Min 1Mb, max 16Mb diff --git a/tests/auto/qhash/qhash.pro b/tests/auto/qhash/qhash.pro index 6fedb824f7..86b98a27e4 100644 --- a/tests/auto/qhash/qhash.pro +++ b/tests/auto/qhash/qhash.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qhash.cpp QT = core -symbian*: { +symbian: { TARGET.EPOCSTACKSIZE =0x5000 -TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" +TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro index 23a73c467f..c0be51810d 100644 --- a/tests/auto/qhttp/qhttp.pro +++ b/tests/auto/qhttp/qhttp.pro @@ -13,7 +13,7 @@ wince*: { addFiles.path = . DEPLOYMENT = addFiles webFiles cgi DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { +} else:symbian { webFiles.sources = webserver/* webFiles.path = webserver cgi.sources = webserver/cgi-bin/* diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro index b9c8622de1..cabab3f4a3 100644 --- a/tests/auto/qicoimageformat/qicoimageformat.pro +++ b/tests/auto/qicoimageformat/qicoimageformat.pro @@ -12,7 +12,7 @@ wince*: { } addPlugins.path = imageformats DEPLOYMENT += addFiles addPlugins -} else:symbian* { +} else:symbian { addFiles.sources = icons addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro index 3e0bd692df..6469211872 100644 --- a/tests/auto/qimage/qimage.pro +++ b/tests/auto/qimage/qimage.pro @@ -6,7 +6,7 @@ wince*: { addImages.path = images DEPLOYMENT += addImages DEFINES += SRCDIR=\\\".\\\" -} else:symbian* { +} else:symbian { TARGET.EPOCHEAPSIZE = 0x200000 0x800000 addImages.sources = images/* addImages.path = images diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro index 402e94b14b..f8fc7fa395 100644 --- a/tests/auto/qimagereader/qimagereader.pro +++ b/tests/auto/qimagereader/qimagereader.pro @@ -27,7 +27,7 @@ wince*: { DEFINES += SRCDIR=\\\".\\\" } -symbian*: { +symbian: { images.sources = images images.path = . diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro index 2171c3ed91..f25472fe68 100644 --- a/tests/auto/qimagewriter/qimagewriter.pro +++ b/tests/auto/qimagewriter/qimagewriter.pro @@ -10,7 +10,7 @@ wince*: { addFiles.path = images DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\".\\\" -} else:symbian* { +} else:symbian { addFiles.sources = images\\*.* addFiles.path = images DEPLOYMENT += addFiles diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro index 2d0bdea79f..92709febae 100644 --- a/tests/auto/qitemmodel/qitemmodel.pro +++ b/tests/auto/qitemmodel/qitemmodel.pro @@ -15,7 +15,7 @@ QT += sql #} symbian { - TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" + TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb qt_not_deployed { contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { sqlite.path = /sys/bin diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro index 0dfe1e947f..c99f1d9fcf 100644 --- a/tests/auto/qlayout/qlayout.pro +++ b/tests/auto/qlayout/qlayout.pro @@ -6,7 +6,7 @@ load(qttest_p4) SOURCES += tst_qlayout.cpp contains(QT_CONFIG, qt3support): QT += qt3support -wince*|symbian*: { +wince*|symbian: { addFiles.sources = baseline addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qlibrary/tst/tst.pro b/tests/auto/qlibrary/tst/tst.pro index e15d7ed306..4c647c005d 100644 --- a/tests/auto/qlibrary/tst/tst.pro +++ b/tests/auto/qlibrary/tst/tst.pro @@ -16,7 +16,7 @@ wince*: { addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" -}else:symbian* { +}else:symbian { binDep.sources = \ mylib.dll \ system.trolltech.test.mylib.dll diff --git a/tests/auto/qline/qline.pro b/tests/auto/qline/qline.pro index 1a3d7f259e..4651fd324f 100644 --- a/tests/auto/qline/qline.pro +++ b/tests/auto/qline/qline.pro @@ -1,6 +1,6 @@ load(qttest_p4) QT -= gui SOURCES += tst_qline.cpp -unix:!mac:!symbian*:!vxworks:LIBS+=-lm +unix:!mac:!symbian:!vxworks:LIBS+=-lm diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/qlocalsocket/qlocalsocket.pro index 287e946aae..3911a64936 100644 --- a/tests/auto/qlocalsocket/qlocalsocket.pro +++ b/tests/auto/qlocalsocket/qlocalsocket.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = lackey test -!wince*:!symbian*: SUBDIRS += example +!wince*:!symbian: SUBDIRS += example symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/qmenubar/qmenubar.pro index a0a6420221..adce164209 100644 --- a/tests/auto/qmenubar/qmenubar.pro +++ b/tests/auto/qmenubar/qmenubar.pro @@ -2,5 +2,5 @@ load(qttest_p4) HEADERS += SOURCES += tst_qmenubar.cpp -contains(QT_CONFIG, qt3support):!symbian*:QT += qt3support +contains(QT_CONFIG, qt3support):!symbian:QT += qt3support diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro index a8ec4785b3..510a70e31a 100644 --- a/tests/auto/qmovie/qmovie.pro +++ b/tests/auto/qmovie/qmovie.pro @@ -13,7 +13,7 @@ wince*: { } -symbian*: { +symbian: { addFiles.sources = animations\\* addFiles.path = animations DEPLOYMENT += addFiles diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro index c8446d1e05..69dc98d6a9 100644 --- a/tests/auto/qpainter/qpainter.pro +++ b/tests/auto/qpainter/qpainter.pro @@ -1,7 +1,7 @@ load(qttest_p4) contains(QT_CONFIG, qt3support): QT += qt3support SOURCES += tst_qpainter.cpp -wince*|symbian*: { +wince*|symbian: { addFiles.sources = drawEllipse drawLine_rop_bitmap drawPixmap_rop drawPixmap_rop_bitmap task217400.png addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro index 930a6f28ce..590fba0e2d 100644 --- a/tests/auto/qpathclipper/qpathclipper.pro +++ b/tests/auto/qpathclipper/qpathclipper.pro @@ -5,6 +5,6 @@ SOURCES += tst_qpathclipper.cpp paths.cpp requires(contains(QT_CONFIG,private_tests)) -unix:!mac:!symbian*:LIBS+=-lm +unix:!mac:!symbian:LIBS+=-lm diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro index a3577bdea8..c3ee192668 100644 --- a/tests/auto/qpixmap/qpixmap.pro +++ b/tests/auto/qpixmap/qpixmap.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qpixmap.cpp contains(QT_CONFIG, qt3support): QT += qt3support -wince*|symbian*: { +wince*|symbian: { task31722_0.sources = convertFromImage/task31722_0/*.png task31722_0.path = convertFromImage/task31722_0 @@ -18,7 +18,7 @@ wince*|symbian*: { wince*: { DEFINES += SRCDIR=\\\".\\\" -} else:symbian* { +} else:symbian { DEPLOYMENT_PLUGIN += qmng LIBS += -lfbscli.dll -lbitgdi.dll -lgdi.dll contains(QT_CONFIG, openvg) { diff --git a/tests/auto/qprocess/testDetached/testDetached.pro b/tests/auto/qprocess/testDetached/testDetached.pro index 319cfa6ff3..80a616b3e9 100644 --- a/tests/auto/qprocess/testDetached/testDetached.pro +++ b/tests/auto/qprocess/testDetached/testDetached.pro @@ -5,6 +5,6 @@ CONFIG -= app_bundle INSTALLS = DESTDIR = ./ -symbian*: { +symbian: { TARGET.EPOCSTACKSIZE =0x14000 } diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro index 3e47b527db..17e36af833 100644 --- a/tests/auto/qresourceengine/qresourceengine.pro +++ b/tests/auto/qresourceengine/qresourceengine.pro @@ -20,7 +20,7 @@ QMAKE_EXTRA_TARGETS = runtime_resource PRE_TARGETDEPS += $${runtime_resource.target} QT = core -wince*|symbian*:{ +wince*|symbian:{ deploy.sources += runtime_resource.rcc parentdir.txt test.sources = testqrc/* test.path = testqrc diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index 7d0f5d058d..fc35f66c92 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -9,7 +9,7 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD\\\" } -wince*|symbian*: { +wince*|symbian: { addFiles.sources = script addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qset/qset.pro b/tests/auto/qset/qset.pro index 05ad07d5e7..b45a015c23 100644 --- a/tests/auto/qset/qset.pro +++ b/tests/auto/qset/qset.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qset.cpp QT = core -symbian*: { +symbian: { TARGET.EPOCSTACKSIZE =0x5000 -TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" +TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/qsound/qsound.pro index 383a0859b1..bb1981c2b4 100644 --- a/tests/auto/qsound/qsound.pro +++ b/tests/auto/qsound/qsound.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsound.cpp -wince*|symbian*: { +wince*|symbian: { deploy.sources += 4.wav DEPLOYMENT = deploy !symbian:DEFINES += SRCDIR=\\\"\\\" diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro index 5ec2b9de97..b11e408302 100644 --- a/tests/auto/qsplitter/qsplitter.pro +++ b/tests/auto/qsplitter/qsplitter.pro @@ -4,7 +4,7 @@ SOURCES += tst_qsplitter.cpp contains(QT_CONFIG, qt3support): QT += qt3support -wince*|symbian*: { +wince*|symbian: { addFiles.sources = extradata.txt setSizes3.dat addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index 1ffe3696a8..11f5943df3 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -2,7 +2,7 @@ load(qttest_p4) TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qstyle.cpp -wince*|symbian*: { +wince*|symbian: { !symbian:DEFINES += SRCDIR=\\\".\\\" addPixmap.sources = task_25863.png addPixmap.path = . diff --git a/tests/auto/qtcpsocket/qtcpsocket.pro b/tests/auto/qtcpsocket/qtcpsocket.pro index 370a69552a..8b1f6642e2 100644 --- a/tests/auto/qtcpsocket/qtcpsocket.pro +++ b/tests/auto/qtcpsocket/qtcpsocket.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs !wince*: SUBDIRS = test stressTest -wince*|symbian*|vxworks* : SUBDIRS = test +wince*|symbian|vxworks* : SUBDIRS = test requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro index cba5a74c84..aa1fbb5206 100644 --- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro +++ b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro @@ -4,7 +4,7 @@ HEADERS += SOURCES += tst_qtextboundaryfinder.cpp !symbian:*:DEFINES += SRCDIR=\\\"$$PWD\\\" -wince*|symbian*:{ +wince*|symbian:{ addFiles.sources = data addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/qtextbrowser/qtextbrowser.pro index e159a3cb47..88061a9d7b 100644 --- a/tests/auto/qtextbrowser/qtextbrowser.pro +++ b/tests/auto/qtextbrowser/qtextbrowser.pro @@ -1,11 +1,11 @@ load(qttest_p4) SOURCES += tst_qtextbrowser.cpp -!symbian*:DEFINES += SRCDIR=\\\"$$PWD\\\" +!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" contains(QT_CONFIG, qt3support): QT += qt3support -wince*|symbian*: { +wince*|symbian: { addFiles.sources = *.html addFiles.path = . addDir.sources = subdir/* diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro index 3efabadf5c..43813da277 100644 --- a/tests/auto/qtextedit/qtextedit.pro +++ b/tests/auto/qtextedit/qtextedit.pro @@ -5,7 +5,7 @@ INCLUDEPATH += ../ HEADERS += SOURCES += tst_qtextedit.cpp -wince*|symbian*: { +wince*|symbian: { addImages.sources = fullWidthSelection/* addImages.path = fullWidthSelection DEPLOYMENT += addImages diff --git a/tests/auto/qthread/qthread.pro b/tests/auto/qthread/qthread.pro index 4ea8fe543f..0b042ab8b2 100644 --- a/tests/auto/qthread/qthread.pro +++ b/tests/auto/qthread/qthread.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qthread.cpp QT = core -symbian*:LIBS += -llibpthread +symbian:LIBS += -llibpthread diff --git a/tests/auto/qthreadstorage/qthreadstorage.pro b/tests/auto/qthreadstorage/qthreadstorage.pro index 376ba654d6..3071098629 100644 --- a/tests/auto/qthreadstorage/qthreadstorage.pro +++ b/tests/auto/qthreadstorage/qthreadstorage.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qthreadstorage.cpp QT = core -symbian*:LIBS += -llibpthread +symbian:LIBS += -llibpthread diff --git a/tests/auto/qtipc/qsharedmemory/test/test.pro b/tests/auto/qtipc/qsharedmemory/test/test.pro index 4ff54869a6..68a5362e2b 100644 --- a/tests/auto/qtipc/qsharedmemory/test/test.pro +++ b/tests/auto/qtipc/qsharedmemory/test/test.pro @@ -24,7 +24,7 @@ addFiles.sources = $$OUT_PWD/../../lackey/lackey.exe ../../lackey/scripts addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\".\\\" -}else:symbian*{ +}else:symbian{ requires(contains(QT_CONFIG,script)) QT += gui script addFiles.sources = ../../lackey/scripts diff --git a/tests/auto/qtransform/qtransform.pro b/tests/auto/qtransform/qtransform.pro index 298feb2034..92bef8ce38 100644 --- a/tests/auto/qtransform/qtransform.pro +++ b/tests/auto/qtransform/qtransform.pro @@ -2,6 +2,6 @@ load(qttest_p4) HEADERS += SOURCES += tst_qtransform.cpp -unix:!mac:!symbian*:LIBS+=-lm +unix:!mac:!symbian:LIBS+=-lm diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro index 2b08b4aad1..5b742f76e9 100644 --- a/tests/auto/qtranslator/qtranslator.pro +++ b/tests/auto/qtranslator/qtranslator.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qtranslator.cpp RESOURCES += qtranslator.qrc -wince*|symbian*: { +wince*|symbian: { addFiles.sources = hellotr_la.qm msgfmt_from_po.qm addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qtwidgets/qtwidgets.pro b/tests/auto/qtwidgets/qtwidgets.pro index b762acb434..9c33cd1269 100644 --- a/tests/auto/qtwidgets/qtwidgets.pro +++ b/tests/auto/qtwidgets/qtwidgets.pro @@ -1,5 +1,5 @@ load(qttest_p4) -symbian*:TARGET.EPOCHEAPSIZE=0x200000 0xa00000 +symbian:TARGET.EPOCHEAPSIZE=0x200000 0xa00000 SOURCES += tst_qtwidgets.cpp mainwindow.cpp HEADERS += mainwindow.h diff --git a/tests/auto/qudpsocket/test/test.pro b/tests/auto/qudpsocket/test/test.pro index 44d3d30eb8..9c0d009009 100644 --- a/tests/auto/qudpsocket/test/test.pro +++ b/tests/auto/qudpsocket/test/test.pro @@ -14,7 +14,7 @@ win32 { DESTDIR = ../ } -wince*|symbian*: { +wince*|symbian: { addApp.sources = ../clientserver/clientserver.exe addApp.path = clientserver DEPLOYMENT += addApp diff --git a/tests/auto/qwmatrix/qwmatrix.pro b/tests/auto/qwmatrix/qwmatrix.pro index 58ea706158..bab298bc93 100644 --- a/tests/auto/qwmatrix/qwmatrix.pro +++ b/tests/auto/qwmatrix/qwmatrix.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qwmatrix.cpp -unix:!mac:!symbian*:LIBS+=-lm +unix:!mac:!symbian:LIBS+=-lm diff --git a/tests/auto/qxml/qxml.pro b/tests/auto/qxml/qxml.pro index 304fc54c92..5fb7fe2904 100644 --- a/tests/auto/qxml/qxml.pro +++ b/tests/auto/qxml/qxml.pro @@ -3,7 +3,7 @@ load(qttest_p4) SOURCES += tst_qxml.cpp QT = core xml -wince*|symbian*: { +wince*|symbian: { addFiles.sources = 0x010D.xml addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro index 4c00d73871..339fa55439 100644 --- a/tests/auto/qxmlformatter/qxmlformatter.pro +++ b/tests/auto/qxmlformatter/qxmlformatter.pro @@ -3,7 +3,7 @@ SOURCES += tst_qxmlformatter.cpp include (../xmlpatterns.pri) -wince*|symbian*:{ +wince*|symbian:{ addFiles.sources = baselines input addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro index cfab56414e..ae73488f11 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -18,7 +18,7 @@ wince* { include (../xmlpatterns.pri) -wince*|symbian*: { +wince*|symbian: { addFiles.sources = pushBaselines input.xml addFiles.path = . diff --git a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/qxmlsimplereader/qxmlsimplereader.pro index bfdec58bc5..c107470b4b 100644 --- a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/qxmlsimplereader/qxmlsimplereader.pro @@ -12,7 +12,7 @@ QT += network xml QT -= gui -wince*|symbian*: { +wince*|symbian: { addFiles.sources = encodings parser xmldocs addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qxmlstream/qxmlstream.pro b/tests/auto/qxmlstream/qxmlstream.pro index f82a7b3dba..8f076be395 100644 --- a/tests/auto/qxmlstream/qxmlstream.pro +++ b/tests/auto/qxmlstream/qxmlstream.pro @@ -4,7 +4,7 @@ SOURCES += tst_qxmlstream.cpp QT = core xml network -wince*|symbian*: { +wince*|symbian: { addFiles.sources = data XML-Test-Suite addFiles.path = . DEPLOYMENT += addFiles |