summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 4.6Janne Anttila2009-08-311-1/+1
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Anttila2009-08-281-1/+1
| |\
| * | Updated docs to reflect current 'createpackage' and 'make sisx' syntax.Janne Anttila2009-08-281-1/+1
| | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
* | | Merge branch 'master' into 4.6Janne Anttila2009-08-286-62/+133
|\ \ \ | | |/ | |/|
| * | Minor fix to space usage in makefile.Janne Anttila2009-08-281-1/+1
| |/ | | | | | | Reviewed-by: TrustMe
| * Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-282-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier createpackage required two separate parameters to define the platform and target. For example > createpackage fluidlauncher_template.pkg release armv5 Now it is changed to: > createpackage fluidlauncher_template.pkg release-armv5 This is consistent to make target what is used to do the building i.e.: > make release-armv5 The change also affected environment variables supported by 'make sisx' target. QT_SISX_PLATFORM is not any more supported, and the info is merged QT_SISX_TARGET variable. Reviewed-by: Miikka Heikkinen
| * Minor fix to MAKEFILE variable in SBSv2 generated makefiles.Janne Anttila2009-08-281-4/+1
| | | | | | | | | | | | | | | | MAKEFILE variable pointed to root bld.inf from which makefile was generated but it shoudl contain the makefile name instead. This is how it work in abld generator. Reviewed-by: TrustMe
| * Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-283-37/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
| * Bug fix for store_build target when using subdirs project template.Janne Anttila2009-08-271-2/+4
| | | | | | | | | | .make.cache need to be generated also for subdirs, this commit fixes this bug in previous commit related to 'make sisx' target.
| * Fixed createpackage.bat params to be more consistent with make targets.Janne Anttila2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Createpackage.bat now accepts also release/debug instead of urel/udeb. Also the order is swicthed so that now you need to call: >createpackage.bat [-i] pkgfile release armv5 [certificate key [passphrase]] instead of >createpackage.bat [-i] pkgfile armv5 urel [certificate key [passphrase]] RevBy: Miikka Heikkinen
| * Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-275-4/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f189e00 added support for template PKG file. This commit extends the template PKG file usage with new make target, i.e. the commit adds a new make target called sisx, which can be used to generate signed sisx files. The sisx target is basically wrapper for calling createpackage.bat, but it also adds support for default platform/target and environment variables. Default platform/target feature means that SIS packages are automatically created for last build target. For example: >qmake >make release-armv5 >make sisx <- Creates sisx for release-armv5 It is also possible to override the platform and target for which the SISX is created as follows: >qmake >make release-armv5 debug-winscw >make sisx PLATFORM=ARMV5 TARGET=UREL <- Creates sisx for release-armv5 Since PLATFORM and TARGET are make variables they can also be defined as an environment variables instead of passing them for make. I.e. the following is indentical to previous example: >set PLATFORM=ARMV5 >set TARGET=UREL >qmake >make release-armv5 debug-winscw >make sisx <- Creates sisx for release-armv5 The environment variables are also useful if you have your own developer certificate what you want to use for signing SIS files. For example: >set CERTIFICATE=mycert.cer >set KEY=mykey.key >qmake >make release-armv5 >make sisx The above example creates release-armv5 SIS package with custom certificate and key (key without password). If certificate and key are not defined, the same logic as in old createpackage.bat will be used i.e. if RD cert is available in Qt root it will be used, and if not self-signed cerfificate will be used. The environment variables supported by 'make sisx' are: PLATFORM TARGET CERTIFICATE KEY PASSPHRASE The createpackage.bat can still be called directly but preferred way is to use new make target directly as examples above demonstrated. Task: 259037 RevBy: Miikka Heikkinen
| * Support for template PKG file.Janne Anttila2009-08-273-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes qmake to generate only one template pkg file, instead of one for each supported platform and build. Due to this change createpackage.bat script now need to be called with two additional parameters - platform and target. Example of needed changes: Instead of old way: >createpackage.bat [-i] pkgfile [certificate key [passphrase]] The new implementation works as: >createpackage.bat [-i] pkgfile platform build [certificate key [passphrase]] In addition createpackage.bat backend is replaced by createpackage.pl, it takes care of preprocesing the pkg file, i.e. expanding the variables with their values and calling the makesis and signsis with right parameters. Perl is used to make implementation more cross-platform. Task: 259037 RevBy: Miikka Heikkinen
* | Fix obsolete license headers.Jason McDonald2009-08-211-1/+1
|/ | | | Reviewed-by: Trust Me
* Add support for LIBS_PRIVATE to the Symbian generators.Jason Barron2009-08-201-1/+2
| | | | | | | | Qt added a new internal variable called LIBS_PRIVATE that should be added to the libraries section of the generated build file. Add this to bring us up to parity with the other platforms. Reviewed-by: Miikka Heikkinen
* Fixed compile warning in qmakeMiikka Heikkinen2009-08-201-1/+1
| | | | | | | | Wrapped QString passed to fprintf into qPrintable to get rid of compiler warning. Task-number: 259463 Reviewed-by: TrustMe
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-198-8/+8
|\
| * Changed names and URLs to reflect name change.axis2009-08-198-8/+8
| | | | | | | | RevBy: Trust me
* | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-194-2/+192
|/ | | | | | | | | | | | | | Removed symbian specific functionality from project.cpp: - generate_test_uid qmake function removed - Uids are now generated automatically for projects that don't have one. - Usage of ICON (in application_icon.prf) now requires explicit UID3 definition. - Autotests that require UID3 in .pro now define it explicitly - Move most symbian specific function implementations away from project.cpp to files under generators/symbian Reviewed-by: Janne Anttila
* Review fixes to qmakeMiikka Heikkinen2009-08-181-3/+3
| | | | | | | - Removed MWC specific code and makefile - Added INTERNAL to few qmake variables that were only used internally Reviewed-by: Janne Koskinen
* Fixed target name corruption in symmakeMiikka Heikkinen2009-08-071-3/+3
|
* Update license headers according to commit 858c70f768e.axis2009-08-068-20/+20
| | | | RevBy: Trust me
* Replaced $MODULE$ with hardcoded module names.axis2009-08-068-8/+8
| | | | RevBy: Trust me
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-062-0/+2
|\
| * Fix WebKit compilation outside of Qt with SBS.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | Propagate QMAKE_MOVE similar to commit 392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Fix WebKit compilation outside of Qt.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | WebKit's .pro file uses shell commands that use QMAKE_MOVE/MOVE. The Symbian generator propagates DEL_FILE, but forgot to also propagate MOVE, like it is done for example in unixmake2.cpp.
* | Removed some commented out code from qmakeMiikka Heikkinen2009-08-061-2/+0
| |
* | Code style fixes to qmakeMiikka Heikkinen2009-08-064-200/+197
| |
* | Further cleanup of qmake codesMiikka Heikkinen2009-08-068-221/+169
|/
* Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-047-157/+121
|
* Removed unused method from SymbianMakefileGenerator.Janne Anttila2009-07-292-14/+0
| | | | | The getWithoutSpecialCharacters wasn't even in sync with similar removeSpecialCharacters method.
* Fixed some tab/space usage in symmake.cppJanne Anttila2009-07-291-20/+20
|
* Extended PKG customization possibilities via qmake.Janne Anttila2009-07-292-22/+85
| | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
* Changed .pkg files to follow the naming scheme of make targets.Janne Anttila2009-07-281-2/+3
| | | | | | | | Task: 246499 QMake now generates the package files like deform_debug-gcce.pkg instead of deform_gcce_udeb.pkg. The new naming scheme is inline with make target which in this example was debug-gcce.
* Made deployment paths with drive letters work.axis2009-07-131-1/+5
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-07-011-1/+3
|\
| * Removed warnings on Symbian.axis2009-06-301-1/+3
| | | | | | | | | | | | | | Library entries produce warnings if they are included in a project which has a static library target. RevBy: Miikka Heikkinen
* | Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-014-112/+105
|/ | | | and cleaned related functionality up a bit.
* Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-2/+10
| | | | | | SUBDIRS projects when using sbsv2. Acked-by: Miikka Heikkinen
* Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-2/+10
| | | | | | SUBDIRS projects when using abld. Acked-by: Miikka Heikkinen
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-038-8/+248
|\
| * Merge branch 'imSelections'axis2009-06-038-8/+248
| |\
| | * Fixed incorrect headers.axis2009-06-038-8/+248
| | |
* | | Removed DEPENDS keyword from resource blocks of generated mmp files from ↵Miikka Heikkinen2009-06-031-2/+3
|/ / | | | | | | symbian-abld builds.
* | Removed unused function from symmakeMiikka Heikkinen2009-06-022-4/+0
|/
* Added VERSION keyword generation to mmp filesMiikka Heikkinen2009-05-062-0/+42
|
* Fixed symbian-sbsv2 ICON keyword so that it will generate iconsMiikka Heikkinen2009-04-301-0/+1
| | | | compatible with older devices (S60 3.1 and up).
* Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
| | | | of localized format.
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+1
|\
| * Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
| | | | | | | | functionality similar to hw deployment.
* | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
|/
generated by cgit v0.12 at 2024-12-29 08:36:34 (GMT)