From 8df35c03963dccc5a24caa8f5ab4c956ba87bcfd Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 25 Jun 2010 11:32:06 +0200 Subject: Removed useless comments. Not relevant anymore after 5b5ae51b22b. --- mkspecs/features/symbian/symbian_building.prf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 08ab3e7..1a691a9 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -104,9 +104,6 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def - # The tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error. - # The comparison of dso files is to avoid extra building of modules that depend on this dso, in - # case it has not changed. QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET}.dll $$symbianDestdir/$${TARGET}.sym \ && elf2e32_qtwrapper --version=$$decVersion \ --sid=$$TARGET.SID \ @@ -155,7 +152,6 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") QMAKE_POST_LINK = && $$QMAKE_POST_LINK } - # the tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET} $$symbianDestdir/$${TARGET}.sym \ && elf2e32_qtwrapper --version $$decVersion \ --sid=$$TARGET.SID \ -- cgit v0.12 From 99c408a8efdaa16363f29c0e67fe97b3c8a7f1c4 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 25 Jun 2010 14:57:37 +0200 Subject: Fixed Symbian resources not honoring TARGET with a path. Task: QT-3540 RevBy: Thomas Zander --- mkspecs/features/sis_targets.prf | 25 ++++--- mkspecs/features/symbian/symbian_building.prf | 104 +++++++++++++------------- 2 files changed, 66 insertions(+), 63 deletions(-) diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 4207e0b..c31e38f 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -126,35 +126,38 @@ equals(GENERATE_SIS_TARGETS, true) { } } else { sis_destdir = $$DESTDIR - !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ - contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") + isEmpty(sis_destdir):sis_destdir = . + baseTarget = $$basename(TARGET) + !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET) sis_target.target = sis - sis_target.commands = createpackage $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \ + sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) sis_target.depends = first unsigned_sis_target.target = unsigned_sis - unsigned_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg + unsigned_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg unsigned_sis_target.depends = first - target_sis_target.target = $${sis_destdir}$${TARGET}.sis + target_sis_target.target = $${sis_destdir}/$${baseTarget}.sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis - installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \ + installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis + installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis - !isEmpty(DESTDIR) { - sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR - installer_sis_target.commands += && $$QMAKE_MOVE $$basename(TARGET).sis $$DESTDIR + !isEmpty(sis_destdir):!equals(sis_destdir, "."):!equals(sis_destdir, "./") { + sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir + installer_sis_target.commands += && $$QMAKE_MOVE $${baseTarget}.sis $$sis_destdir } QMAKE_EXTRA_TARGETS += sis_target \ unsigned_sis_target \ target_sis_target \ installer_sis_target + + QMAKE_DISTCLEAN += $${sis_destdir}/$${baseTarget}.sis } } else { contains(TEMPLATE, subdirs) { @@ -177,5 +180,3 @@ equals(GENERATE_SIS_TARGETS, true) { QMAKE_EXTRA_TARGETS += store_build_target } } - -QMAKE_DISTCLEAN += $${sis_destdir}$${TARGET}.sis diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 08ab3e7..744580f 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -21,6 +21,8 @@ symbianDestdir=$$DESTDIR isEmpty(symbianDestdir) { symbianDestdir = . } +baseTarget = $$basename(TARGET) +!equals(TARGET, "$$baseTarget"):symbianDestdir = $$symbianDestdir/$$dirname(TARGET) contains(QMAKE_CFLAGS, "--thumb")|contains(QMAKE_CXXFLAGS, "--thumb")|contains(QMAKE_CFLAGS, "-mthumb")|contains(QMAKE_CXXFLAGS, "-mthumb") { DEFINES += __MARM_THUMB__ @@ -107,29 +109,29 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { # The tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error. # The comparison of dso files is to avoid extra building of modules that depend on this dso, in # case it has not changed. - QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET}.dll $$symbianDestdir/$${TARGET}.sym \ + QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget}.dll $$symbianDestdir/$${baseTarget}.sym \ && elf2e32_qtwrapper --version=$$decVersion \ --sid=$$TARGET.SID \ --uid1=0x10000079 \ --uid2=$$TARGET.UID2 \ --uid3=$$TARGET.UID3 \ --targettype=DLL \ - --elfinput=$${symbianDestdir}/$${TARGET}.sym \ - --output=$${symbianDestdir}/$${TARGET}.dll \ - --tmpdso=$${symbianObjdir}/$${TARGET}.dso \ - --dso=$${symbianDestdir}/$${TARGET}.dso \ - --defoutput=$$symbianObjdir/$${TARGET}.def \ - --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll \ + --elfinput=$${symbianDestdir}/$${baseTarget}.sym \ + --output=$${symbianDestdir}/$${baseTarget}.dll \ + --tmpdso=$${symbianObjdir}/$${baseTarget}.dso \ + --dso=$${symbianDestdir}/$${baseTarget}.dso \ + --defoutput=$$symbianObjdir/$${baseTarget}.def \ + --linkas=$${baseTarget}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll \ --heap=$$epoc_heap_size \ --stack=$$TARGET.EPOCSTACKSIZE \ $$elf2e32_LIBPATH \ $$capability \ $$QMAKE_ELF2E32_FLAGS \ $$QMAKE_POST_LINK - QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}.sym - QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}.dso - QMAKE_CLEAN += $${symbianObjdir}/$${TARGET}.dso - QMAKE_CLEAN += $${symbianObjdir}/$${TARGET}.def + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.dso + QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.dso + QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.def linux-armcc: { LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) @@ -145,7 +147,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { -lgcc } - QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll + QMAKE_LFLAGS += --soname $${baseTarget}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll DEFINES += __DLL__ } @@ -156,26 +158,26 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_POST_LINK = && $$QMAKE_POST_LINK } # the tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error - QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET} $$symbianDestdir/$${TARGET}.sym \ + QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget} $$symbianDestdir/$${baseTarget}.sym \ && elf2e32_qtwrapper --version $$decVersion \ --sid=$$TARGET.SID \ --uid1=0x1000007a \ --uid2=$$TARGET.UID2 \ --uid3=$$TARGET.UID3 \ --targettype=EXE \ - --elfinput=$${symbianDestdir}/$${TARGET}.sym \ - --output=$${symbianDestdir}/$${TARGET}.exe \ - --linkas=$${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe \ + --elfinput=$${symbianDestdir}/$${baseTarget}.sym \ + --output=$${symbianDestdir}/$${baseTarget}.exe \ + --linkas=$${baseTarget}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe \ --heap=$$epoc_heap_size \ --stack=$$TARGET.EPOCSTACKSIZE \ $$elf2e32_LIBPATH \ $$capability \ $$QMAKE_ELF2E32_FLAGS \ - && ln "$${symbianDestdir}/$${TARGET}.exe" "$${symbianDestdir}/$$TARGET" \ + && ln "$${symbianDestdir}/$${baseTarget}.exe" "$${symbianDestdir}/$${baseTarget}" \ $$QMAKE_POST_LINK - QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}.sym - QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}.exe - QMAKE_CLEAN += $${symbianDestdir}/$${TARGET} + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.exe + QMAKE_CLEAN += $${symbianDestdir}/$${baseTarget} linux-armcc: { QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) @@ -204,7 +206,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_LFLAGS += --shared } - QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe + QMAKE_LFLAGS += --soname $${baseTarget}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe DEFINES += __EXE__ } @@ -245,47 +247,47 @@ symbianresources.CONFIG = no_link target_predeps QMAKE_EXTRA_COMPILERS += symbianresources contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { - baseTarget = $$basename(TARGET) + baseResourceTarget = $$basename(TARGET) # If you change this, also see application_icon.prf - baseTarget = $$replace(baseTarget, " ",_) + baseResourceTarget = $$replace(baseResourceTarget, " ",_) # Make our own extra target in order to get dependencies for generated # files right. This also avoids the warning about files not found. - symbianGenResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg + symbianGenResource.target = $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg symbianGenResource.commands = cpp -nostdinc -undef \ $$symbian_resources_INCLUDES \ $$symbian_resources_DEFINES \ - $${baseTarget}.rss \ - -o $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \ + $${baseResourceTarget}.rss \ + -o $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp \ && rcomp -u -m045,046,047 \ - -s$${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \ - -o$${symbianDestdir}/$${baseTarget}.rsc \ - -h$${symbian_resources_RCC_DIR}/$${baseTarget}.rsg \ - -i$${baseTarget}.rss - symbianGenResource.depends = $${baseTarget}.rss - PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp - QMAKE_DISTCLEAN += $${baseTarget}.rss - QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.rsc + -s$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp \ + -o$${symbianDestdir}/$${baseResourceTarget}.rsc \ + -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg \ + -i$${baseResourceTarget}.rss + symbianGenResource.depends = $${baseResourceTarget}.rss + PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp + QMAKE_DISTCLEAN += $${baseResourceTarget}.rss + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseResourceTarget}.rsc - symbianGenRegResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg + symbianGenRegResource.target = $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg symbianGenRegResource.commands = cpp -nostdinc -undef \ $$symbian_resources_INCLUDES \ $$symbian_resources_DEFINES \ - $${baseTarget}_reg.rss \ - -o $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \ + $${baseResourceTarget}_reg.rss \ + -o $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp \ && rcomp -u -m045,046,047 \ - -s$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \ - -o$${symbianDestdir}/$${baseTarget}_reg.rsc \ - -h$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg \ - -i$${baseTarget}_reg.rss - symbianGenRegResource.depends = $${baseTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg - PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp - QMAKE_DISTCLEAN += $${TARGET}_reg.rss - QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}_reg.rsc + -s$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp \ + -o$${symbianDestdir}/$${baseResourceTarget}_reg.rsc \ + -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg \ + -i$${baseResourceTarget}_reg.rss + symbianGenRegResource.depends = $${baseResourceTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg + PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp + QMAKE_DISTCLEAN += $${baseResourceTarget}_reg.rss + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseResourceTarget}_reg.rsc # Trick to get qmake to create the RCC_DIR for us. symbianRccDirCreation.input = SOURCES @@ -296,9 +298,9 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { QMAKE_EXTRA_TARGETS += symbianGenResource symbianGenRegResource QMAKE_EXTRA_COMPILERS += symbianRccDirCreation - QMAKE_DISTCLEAN += $${TARGET}.loc + QMAKE_DISTCLEAN += $${baseTarget}.loc } # Generated pkg files -QMAKE_DISTCLEAN += $${TARGET}_template.pkg +QMAKE_DISTCLEAN += $${baseTarget}_template.pkg -- cgit v0.12 From bbb3420e74ee005e0d2b688af65c4ecfe5771235 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 25 Jun 2010 16:45:57 +0200 Subject: Various fixes to autotests when using the symbian/linux-armcc mkspec. --- tests/auto/checkxmlfiles/checkxmlfiles.pro | 2 +- tests/auto/corelib.pro | 7 +++++++ tests/auto/gui.pro | 8 ++++++++ tests/auto/mediaobject/mediaobject.pro | 2 +- tests/auto/networkselftest/networkselftest.pro | 2 +- tests/auto/patternistexamples/patternistexamples.pro | 2 +- .../qapplication/desktopsettingsaware/desktopsettingsaware.pro | 5 +++-- tests/auto/qapplication/test/test.pro | 2 +- tests/auto/qaudiooutput/qaudiooutput.pro | 2 +- tests/auto/qchar/qchar.pro | 4 ++-- tests/auto/qclipboard/test/test.pro | 4 ++-- tests/auto/qcryptographichash/qcryptographichash.pro | 4 ++-- tests/auto/qdiriterator/qdiriterator.pro | 2 +- tests/auto/qdom/qdom.pro | 2 +- tests/auto/qfile/qfile.pro | 2 +- tests/auto/qfileinfo/qfileinfo.pro | 2 +- tests/auto/qftp/qftp.pro | 2 +- tests/auto/qgraphicsscene/qgraphicsscene.pro | 4 ++-- tests/auto/qhash/qhash.pro | 4 ++-- tests/auto/qhttp/qhttp.pro | 2 +- tests/auto/qicoimageformat/qicoimageformat.pro | 2 +- tests/auto/qimage/qimage.pro | 2 +- tests/auto/qimagereader/qimagereader.pro | 2 +- tests/auto/qimagewriter/qimagewriter.pro | 2 +- tests/auto/qitemmodel/qitemmodel.pro | 2 +- tests/auto/qlayout/qlayout.pro | 2 +- tests/auto/qlibrary/tst/tst.pro | 2 +- tests/auto/qline/qline.pro | 2 +- tests/auto/qlocalsocket/qlocalsocket.pro | 2 +- tests/auto/qmenubar/qmenubar.pro | 2 +- tests/auto/qmovie/qmovie.pro | 2 +- tests/auto/qpainter/qpainter.pro | 2 +- tests/auto/qpathclipper/qpathclipper.pro | 2 +- tests/auto/qpixmap/qpixmap.pro | 4 ++-- tests/auto/qprocess/testDetached/testDetached.pro | 2 +- tests/auto/qresourceengine/qresourceengine.pro | 2 +- tests/auto/qscriptengine/qscriptengine.pro | 2 +- tests/auto/qset/qset.pro | 4 ++-- tests/auto/qsound/qsound.pro | 2 +- tests/auto/qsplitter/qsplitter.pro | 2 +- tests/auto/qstyle/qstyle.pro | 2 +- tests/auto/qtcpsocket/qtcpsocket.pro | 2 +- tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro | 2 +- tests/auto/qtextbrowser/qtextbrowser.pro | 4 ++-- tests/auto/qtextedit/qtextedit.pro | 2 +- tests/auto/qthread/qthread.pro | 2 +- tests/auto/qthreadstorage/qthreadstorage.pro | 2 +- tests/auto/qtipc/qsharedmemory/test/test.pro | 2 +- tests/auto/qtransform/qtransform.pro | 2 +- tests/auto/qtranslator/qtranslator.pro | 2 +- tests/auto/qtwidgets/qtwidgets.pro | 2 +- tests/auto/qudpsocket/test/test.pro | 2 +- tests/auto/qwmatrix/qwmatrix.pro | 2 +- tests/auto/qxml/qxml.pro | 2 +- tests/auto/qxmlformatter/qxmlformatter.pro | 2 +- tests/auto/qxmlquery/qxmlquery.pro | 2 +- tests/auto/qxmlsimplereader/qxmlsimplereader.pro | 2 +- tests/auto/qxmlstream/qxmlstream.pro | 2 +- 58 files changed, 81 insertions(+), 65 deletions(-) diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index d53c11c..319ba9b 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 259be4c..531fed2 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 a8fd2b4..cfaa3fa 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 bef2fe9..e887df4 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 b0d537a..d7cb7f3 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 c528c93..f83e0aa 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 e8b1ce9..3193764 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 e68af26..30eb751 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 a6286ec..e1734e0 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 a534d14..3813e4e 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 62a38af..0f8cad1 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 aa9a7c4..7e1a866 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 ece886c..d60b52d 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 61914b5..5434ada 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 33fd2fd..0383e30 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 2038514..ef5ed22 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 33d479a..9618962 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 401c9eb..cc6f585 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 6fedb82..86b98a2 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 23a73c4..c0be518 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 b9c8622..cabab3f 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 3e0bd69..6469211 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 402e94b..f8fc7fa 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 2171c3e..f25472f 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 2d0bdea..92709fe 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 0dfe1e9..c99f1d9 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 e15d7ed..4c647c0 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 1a3d7f2..4651fd3 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 287e946..3911a64 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 a0a6420..adce164 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 a8ec478..510a70e 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 c8446d1..69dc98d 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 930a6f2..590fba0 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 a3577bd..c3ee192 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 319cfa6..80a616b 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 3e47b52..17e36af 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 7d0f5d0..fc35f66 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 05ad07d..b45a015 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 383a085..bb1981c 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 5ec2b9d..b11e408 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 1ffe369..11f5943 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 370a695..8b1f664 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 cba5a74..aa1fbb5 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 e159a3c..88061a9 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 3efabad..43813da 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 4ea8fe5..0b042ab 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 376ba65..3071098 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 4ff5486..68a5362 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 298feb2..92bef8c 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 2b08b4a..5b742f7 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 b762acb..9c33cd1 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 44d3d30..9c0d009 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 58ea706..bab298b 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 304fc54..5fb7fe2 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 4c00d73..339fa55 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 cfab564..ae73488 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 bfdec58..c107470 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 f82a7b3..8f076be 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 -- cgit v0.12 From 48dfb5bab110f8cfa5e3a9d5a68f328728099318 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 29 Jun 2010 14:04:45 +0200 Subject: Added the APP_PRIVATE_DIR_BASE variable. RevBy: Miikka Heikkinen --- mkspecs/features/symbian/data_caging_paths.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf index 6b38d4d..2f03128 100644 --- a/mkspecs/features/symbian/data_caging_paths.prf +++ b/mkspecs/features/symbian/data_caging_paths.prf @@ -76,4 +76,5 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) { isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps -isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps \ No newline at end of file +isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps +isEmpty(APP_PRIVATE_DIR_BASE): APP_PRIVATE_DIR_BASE = /private -- cgit v0.12 From b6687616708d953df52c84d4e9bc06196a75c553 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 29 Jun 2010 14:01:17 +0200 Subject: Fixed a relative path problem in qml demos. qmake doesn't handle the relative path very well. RevBy: Alessandro Portale --- demos/embedded/qmlcalculator/deployment.pri | 2 +- demos/embedded/qmlclocks/deployment.pri | 2 +- demos/embedded/qmldialcontrol/deployment.pri | 2 +- demos/embedded/qmleasing/deployment.pri | 2 +- demos/embedded/qmlflickr/deployment.pri | 2 +- demos/embedded/qmlphotoviewer/deployment.pri | 2 +- demos/embedded/qmltwitter/deployment.pri | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demos/embedded/qmlcalculator/deployment.pri b/demos/embedded/qmlcalculator/deployment.pri index a0bfbb6..53c6dbf 100644 --- a/demos/embedded/qmlcalculator/deployment.pri +++ b/demos/embedded/qmlcalculator/deployment.pri @@ -1,7 +1,7 @@ qmlcalculator_src = $$PWD/../../declarative/calculator symbian { qmlcalculator_uid3 = A000E3FB - qmlcalculator_files.path = ../$$qmlcalculator_uid3 + qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3 } qmlcalculator_files.sources = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core DEPLOYMENT += qmlcalculator_files diff --git a/demos/embedded/qmlclocks/deployment.pri b/demos/embedded/qmlclocks/deployment.pri index a30e403..03ba129 100644 --- a/demos/embedded/qmlclocks/deployment.pri +++ b/demos/embedded/qmlclocks/deployment.pri @@ -1,7 +1,7 @@ qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks symbian { qmlclocks_uid3 = A000E3FC - qmlclocks_files.path = ../$$qmlclocks_uid3 + qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3 } qmlclocks_files.sources = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content DEPLOYMENT += qmlclocks_files diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/demos/embedded/qmldialcontrol/deployment.pri index c04ed05..097c74c 100644 --- a/demos/embedded/qmldialcontrol/deployment.pri +++ b/demos/embedded/qmldialcontrol/deployment.pri @@ -1,7 +1,7 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol symbian { qmldialcontrol_uid3 = A000E3FD - qmldialcontrol_files.path = ../$$qmldialcontrol_uid3 + qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 } qmldialcontrol_files.sources = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content DEPLOYMENT += qmldialcontrol_files diff --git a/demos/embedded/qmleasing/deployment.pri b/demos/embedded/qmleasing/deployment.pri index bc37348..47192e6 100644 --- a/demos/embedded/qmleasing/deployment.pri +++ b/demos/embedded/qmleasing/deployment.pri @@ -1,7 +1,7 @@ qmleasing_src = $$PWD/../../../examples/declarative/animation/easing symbian { qmleasing_uid3 = A000E3FE - qmleasing_files.path = ../$$qmleasing_uid3 + qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 } qmleasing_files.sources = $$qmleasing_src/easing.qml DEPLOYMENT += qmleasing_files diff --git a/demos/embedded/qmlflickr/deployment.pri b/demos/embedded/qmlflickr/deployment.pri index c1f82df..c8fef1a 100644 --- a/demos/embedded/qmlflickr/deployment.pri +++ b/demos/embedded/qmlflickr/deployment.pri @@ -1,7 +1,7 @@ qmlflickr_src = $$PWD/../../declarative/flickr symbian { qmlflickr_uid3 = A000E3FF - qmlflickr_files.path = ../$$qmlflickr_uid3 + qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3 } qmlflickr_files.sources = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile DEPLOYMENT += qmlflickr_files diff --git a/demos/embedded/qmlphotoviewer/deployment.pri b/demos/embedded/qmlphotoviewer/deployment.pri index 0a457de..128a1f7 100644 --- a/demos/embedded/qmlphotoviewer/deployment.pri +++ b/demos/embedded/qmlphotoviewer/deployment.pri @@ -1,7 +1,7 @@ qmlphotoviewer_src = $$PWD/../../declarative/photoviewer symbian { qmlphotoviewer_uid3 = A000E400 - qmlphotoviewer_files.path = ../$$qmlphotoviewer_uid3 + qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3 } qmlphotoviewer_files.sources = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/demos/embedded/qmltwitter/deployment.pri b/demos/embedded/qmltwitter/deployment.pri index 34c8cd1..40c53ad 100644 --- a/demos/embedded/qmltwitter/deployment.pri +++ b/demos/embedded/qmltwitter/deployment.pri @@ -1,7 +1,7 @@ qmltwitter_src = $$PWD/../../declarative/twitter symbian { qmltwitter_uid3 = A000E401 - qmltwitter_files.path = ../$$qmltwitter_uid3 + qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3 } qmltwitter_files.sources = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore DEPLOYMENT += qmltwitter_files -- cgit v0.12 From 2de30dafb76388b4e9ea5b8d6ea385d81da7ea37 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 29 Jun 2010 14:07:01 +0200 Subject: Fixed deployment paths for the symbian/linux-armcc mkspec. Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me --- demos/embedded/fluidlauncher/fluidlauncher.pro | 9 +++++---- .../declarative/cppextensions/imageprovider/imageprovider.pro | 2 +- examples/declarative/cppextensions/qwidgets/qwidgets.pro | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index 416e58b..ca74c38 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -118,7 +118,7 @@ symbian { } contains(QT_CONFIG, multimedia) { - reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc + reg_resource.sources += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc) } @@ -202,10 +202,11 @@ symbian { } contains(QT_CONFIG, multimedia) { - executables.sources += spectrum.exe fftreal.dll - resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc + executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe + executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll + resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc) mifs.sources += \ - $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif + $$appResourceDir(demos/spectrum/app/spectrum.mif) } contains(QT_CONFIG, script) { diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index c7e7843..7149986 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -22,7 +22,7 @@ symbian:{ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 - importFiles.sources = qmlimageproviderplugin.dll ImageProviderCore/qmldir + importFiles.sources = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir importFiles.path = ImageProviderCore DEPLOYMENT = importFiles } diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 3ec7d29..2e610f9 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -17,7 +17,7 @@ symbian:{ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 - importFiles.sources = qmlqwidgetsplugin.dll QWidgets/qmldir + importFiles.sources = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir importFiles.path = QWidgets DEPLOYMENT = importFiles -- cgit v0.12 From ce57d92ef5723f54c1e3a1b50d66eb74273b995b Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 29 Jun 2010 14:38:42 +0300 Subject: Fix s60main linking issue with gcce applications MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA must not be included in s60main build, otherwise some symbols will not be relocatable when linked against from gcce build. Task-number: QTBUG-11804 Reviewed-by: Alessandro Portale --- src/s60main/s60main.pro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro index 1ba105d..9ea3080 100644 --- a/src/s60main/s60main.pro +++ b/src/s60main/s60main.pro @@ -25,6 +25,10 @@ symbian { # Workaround for abld toolchain problem to make ARMV6 qtmain.lib link with GCCE apps symbian-abld: QMAKE_CXXFLAGS.ARMCC += --dllimport_runtime + + # Having MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA will cause s60main.lib be unlinkable + # against GCCE apps, so remove it + MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA } else { error("$$_FILE_ is intended only for Symbian!") } -- cgit v0.12 From 05f4d51a69516aa585f9941960afd483325e562f Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 29 Jun 2010 14:57:35 +0200 Subject: Fixed deployment paths for WebKit declarative plugin. --- src/3rdparty/webkit/WebCore/WebCore.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 1162a52..c1661a4 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -26,7 +26,7 @@ symbian: { webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) contains(QT_CONFIG, declarative) { - declarativeImport.sources = qmlwebkitplugin$${QT_LIBINFIX}.dll + declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll declarativeImport.sources += ../WebKit/qt/declarative/qmldir declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit DEPLOYMENT += declarativeImport -- cgit v0.12