summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1311-11/+11
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2911-264/+264
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0111-22/+22
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Symbian: qmake: Fix emulator deployment destinationsJaakko Helanti2012-01-172-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | This fix affects how qmake generates "bld.inf" file. Earlier, all emulator deployments went to epoc32/winscw/c, which is the C-drive of the emulator. However, emulator implementation expects often to find deployments from epoc32/release/winscw/udeb/z, which is the ROM drive of the emulator. For this reason many things, including QML deployments, did not work in the emulator. Now the fixed deployment is as follows: - If pro-file deployment has no path value, it goes to emulator ROM drive. - If pro-file deployment has path variable with no drive letter, it goes to emulator ROM drive. - If pro-file deployment has path variable with drive letter, it goes to the given emulator drive. - If pro-file deployment has path variable with '!' as drive letter, it goes to emulator C drive. When making emulator ROM-drive deployment, two deployments are made, one to udeb and one to urel emulator. Task-number: ou1cimx1#954237 Change-Id: I62d3f5b479ee0c0c547e824bb45ae8c0a6484d87 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1111-11/+11
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERSMiikka Heikkinen2011-12-091-0/+4
| | | | | | | | | | | The case of the drive letter generated to the absolute paths seems to have changed between 4.7 and 4.8, which led into regression with projects that utilize $$PWD in target name, as that still returns the path with drive letter in same case as previously. Fixed the critical check to be case insensitive in windows. Task-number: ou1cimx1#951456 Reviewed-by: Murray Read
* Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-071-5/+10
| | | | | | | | Some Qt language codes now map to two Symbian language codes. Also added the missing en_in mapping. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Symbian: Only localize the application .rss that needs it, not all .rssMiikka Heikkinen2011-12-072-2/+1
| | | | | | | | | Move LANG statement into proper RESOURCE block inside generated .mmp file, so it doesn't affect _reg.rss, which doesn't need to be localized. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-301-0/+1
| | | | | | | | | | A lot of platform applications have all-lowercase translation files due to file naming policies. This makes no difference for runtime translation, so removed unnecessary case sensitivity when parsing ts filenames for localization deployment. Task-number: QT-5305 Reviewed-by: Sami Merila
* Remove few unused variables.Miikka Heikkinen2011-09-061-2/+0
| | | | | | | The languageAttribute and underscoreChar variables were not used in SymbianCommonGenerator::parseTsContent function, so removed them. Reviewed-by: TrustMe
* Symbian: Detect app caption and pkg name translations by id attribute.Miikka Heikkinen2011-09-061-33/+28
| | | | | | | | | | | | | | | | | To better support various localization tools, added an alternate way to detect application caption and package name translations in .ts files. Now in addition to specific source text the id attribute of the message element can be used to identify interesting translations. The ids qmake is looking for are: qtn_short_caption_<appname> qtn_long_caption_<appname> qtn_package_name_<appname> qtn_smart_installer_package_name_<appname> Task-number: QT-5247 Reviewed-by: Sami Merila
* Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-245-29/+26
| | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| * Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, when parsing .ts files for deployment localization, qmake would break if there was any translation using lengthvariants inside QtApplicationCaptions context. Technically this is legal though QtApplicationCaptions context is only meant for application captions and we don't support lenghtvariants for the actual captions themselves. Changed parsing so that any child elements on translations are simply skipped instead of causing parsing errors. Task-number: QT-5169 Reviewed-by: Guoqing Zhang
| * Update licenseheader text in source filesJyri Tahtela2011-05-1311-187/+187
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-2/+1
| |\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * Added Symbian deployment localization for makefile build system.axis2011-03-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2411-191/+229
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-202-4/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Increased EPOCHEAPSIZE for qpainter benchmark Increased EPOCHEAPSIZE for few benchmarks Update Symbian DEF-files Improve DEFINES crossplatform compatibility in Symbian builds. Freezing the QtCore defs again for 4.8.
| | * | | Improve DEFINES crossplatform compatibility in Symbian builds.Miikka Heikkinen2011-05-162-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEFINES statements that define strings needed separate statements for symbian-sbsv2 builds and Makefile based plaforms, as there is one extra layer of escaping needed in Makefile builds. Improved compatibility by making qmake remove one layer of escaping before writing the .mmp MACROs based on DEFINES. Note: Symbian-abld builds still do not support string DEFINES as the toolchain simply can't handle them in .mmp files, no matter how they are escaped. Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either, as bld.inf files do not like doubly escaped characters in extension rules (e.g. double-quotation mark as part of a string). This makes it impossible to pass such DEFINES to extra compilers. Task-number: QTBUG-19232 Reviewed-by: Oswald Buddenhagen
| * | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1311-187/+187
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-281-0/+1
|/ / / | | | | | | | | | (4.7-generated-declarative branch).
* | | Fix emulator deployment for items with "!:" drive.Miikka Heikkinen2011-03-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | "!:" drive is used to indicate need to prompt user to specify installation drive, which is obviously not happening when we do the build time emulator deployment, so default it to "c:" drive. Task-number: QTBUG-18134 Reviewed-by: Janne Koskinen
* | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-161-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* | | | Removed broken "deploy.path" support from SymbianMiikka Heikkinen2011-03-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The undocumented special "deploy.path" variable hasn't been working in Symbian for several releases and doesn't really make much sense in Symbian in the first place. Also, apparently no-one has ever used it as there has been no bug reports, so might as well remove the check for it in Symbian. Task-number: QTBUG-14426 Reviewed-by: Janne Koskinen
* | | | Strip echo suppression character "@" from commands in symbian-sbsv2Miikka Heikkinen2011-03-101-0/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Symbian-sbsv2 toolchain cannot handle echo suppresion character "@" in recipes, so the character is stripped from all commands if it exists at the beginning of the command. Task-number: QTBUG-4767 Reviewed-by: Iain
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-211-0/+12
| |/ | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
* | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-2/+1
|\ \ | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3111-37/+52
| |\ \
| * | | Added Symbian deployment localization for makefile build system.axis2011-01-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-24/+33
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * | Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | Mif file cleaning was incorrectly done at distclean phase. Task-number: QTBUG-16893 Reviewed-by: axis
| * | No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-273-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no fundamental reason to not have dash or dot in binary names in Symbian, so do not replace them with underscore. One thing that doesn't work with a dot in the filename is launching an application via resources, so automatic resource generation is suppressed for applications that have a dot in filename portion of the TARGET value. Task-number: QTBUG-16888 Reviewed-by: axis
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-261-1/+1
|\ \ \ | |/ /
| * | Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Proper fixed targets was not used to generate the dependency for QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen before actual linking. Task-number: QTBUG-16881 Reviewed-by: axis
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-252-25/+40
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * | Fixed UTF-8 application names in device application menu in SymbianMiikka Heikkinen2011-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | CHARACTER_SET UTF8 statement was missing from generated .rss file, causing localized application names containing UTF-8 characters to be rendered incorrectly. Task-number: QT-4476 Reviewed-by: axis
| * | Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-201-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_POST_LINK value handling now uses the same automatic replacements as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling. In practice this means that it is now possible to use $$QMAKE_COPY and friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and that any backslashes in the value are assumed to be path separators and will be converted to forward slashes. Task-number: QTBUG-16753 Reviewed-by: Janne Koskinen
| * | Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toolcheck can cause generic clean fail (i.e. "make clean" or "make debug-clean") for e.g. environments where Carbide command line tools have not been installed, because sbsv2 toolchain does a check for all tools related to target platforms, even though they are not needed for actual cleaning. Task-number: QTBUG-16691 Reviewed-by: Janne Koskinen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1711-11/+11
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1011-11/+11
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-052-0/+50
|\ \ | |/
| * Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | | | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-1/+1
|\ \ | |/ | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| | | | | | | | | | | | | | | | No checking for the end of xml file was done in while loop looking for TS element. Task-number: QTBUG-16261 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Remove unused variableMiikka Heikkinen2010-11-261-1/+0
| | | | | | | | | | | | | | Variable currentClause is no longer used for anything, so removed its declaration. Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-09-04 15:14:09 (GMT)