| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VERSION_FLAGS.<keyword> can now be used for all compilers and not
just armcc, and version flagging can now be used with QMAKE_LFLAGS
as well as QMAKE_CXXFLAGS.
Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords
for OPTION and LINKEROPTION statements, which are defined via
QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables.
This improves flexibility in the future if new keywords need to be
supported.
Task-number: QTBUG-8685
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added support for the following RSS_RULES variables to improve control
over placement of user defined rules inside application registration
resource file:
RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO
RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO
RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item
in the service_list of APP_REGISTRATION_INFO
RSS_RULES.file_ownership_list - Rule placed inside a
FILE_OWNERSHIP_INFO item in the file_ownership_list
of APP_REGISTRATION_INFO
RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the
datatype_list of APP_REGISTRATION_INFO
Task-number: QT-3083
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
| |
Prj_extensions tag is replaced with prj_testextensions tag when
CONFIG contains symbian_test
Task-number: QT-2985
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
| |
Canonical paths were resolving to empty if the paths didn't exist,
which causes problems for clean platform builds. Using absolute paths
instead will generate all required paths.
This will cause a minor inconvenience of warnings about some nonexistent
paths during makefile generation phase of abld builds, but this is
unavoidable. Sbsv2 builds do not display any warnings.
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
| |
Previous s60installs specific fix was flawed in that it failed to
generate exports when doing clean build. Replaced that with a more
generic solution that exports plugin stubs under \epoc32\data\z
always.
Task-number: QTBUG-6972
Reviewed-by: Janne Anttila
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tool uses TRK to launch the application.
TRK is a debug agent, available as a signed package for consumer phones.
For Nokia phones, it is distributed with carbide; for other manufacturers
it can be downloaded from their developer websites.
The launcher code is reused from Qt creator, with a patch to allow us
to pass command line arguments to the process being launched.
The "make run" target is enhanced to support running on target as well as
the emulator. Like the "make sis" target, the last platform to have been
built is the one that will be launched.
The runonphone tool needs to be built in a Qt environment configured for
windows, and requires at least windows XP (Symbian development requires
windows XP SP2). Current proposal is to include a statically linked exe
in the bin directory for binary packages.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
| |
Added warning to qmake when it detects MMP_RULES that override
MMP statements created by qmake variables.
Also harmonized the way << operator is used with #defined strings in
symmake.cpp.
Task-number: QTBUG-5407
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change makes it possible to define ICON keyword in pro file
without UID3.
It is safe to use target as an icon name since Symbian devices cannot
have two different binaries with the same name as all binaries are
located in \sys\bin. This means there cannot be also two mif files
with same target name. Also all native S60 apps use target name as an
MIF basename. Target name is also much easier to associate with app
than UID.
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Webkit cannot build because of too long command lines in the sbsv2 config.
There is an alternative workaround in raptor for the relative include paths
problem, i.e. "sbs -c winscw_udeb.mwccinc"
Removing the temp dirs from being created and added to systeminclude makes the
command line short enough again that webkit can be compiled.
Reviewed-By: Miikka Heikkinen
Based on following commit from the no-tmp-dirs branch:
commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b
Author: Iain <qt-info@nokia.com>
Date: Wed Oct 7 13:45:48 2009 +0200
First attempt at removing the tmp dirs workaround on Symbian OS
I may not have caught all the places where it is used, but MMP files
look OK afterwards.
TODO: Slightly concerned that I've trimmed too much from the abld generator
as I think that the bit I cut was also used for other temp dirs
|
|
|
|
|
|
|
|
|
| |
If MMP_RULES contains TARGETTYPE or any OPTION statements, default
values for these will not be added to MMP file. This allows for example
conditional OPTIONs and using native PLUGIN target type using MMP_RULES.
Task-number: QT-2229
Reviewed-by: axis
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Renaming done based feedback.
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
| |
|
| |
|
|
|
|
|
| |
The getWithoutSpecialCharacters wasn't even in sync with similar
removeSpecialCharacters method.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
and cleaned related functionality up a bit.
|
|\ |
|
| | |
|
|/ |
|
| |
|
| |
|
|
|