| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VERSION_FLAGS.ARMCC variable is used in symbian.conf to define
supported armcc compiler version flags. Values given to this
variable must be directly usable as ifdef flags in mmp.
QMAKE_CXXFLAGS.<version flag> variables can now be used to add
compiler options to specific compiler versions.
Note that options added via QMAKE_CXXFLAGS.ARMCC flag
will apply to all versions of armcc compiler.
Task-number: QTBUG-8685
Reviewed-by: Iain
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
| |
Since the build process copies everything that is deployed using
DEPLOYMENT variable under epoc32 somewhere, pkg files might as well
look for the files from there. This can be useful for binary
releases if the release needs to be repackaged.
Task-number: QT-3147
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using recursive QMAKE_EXTRA_TARGETS, qmake will use CHK_DIR_EXISTS
and MKDIR when ensuring each subdir has a Makefile created.
These previously weren't defined for Symbian.
Note that this problem was hidden in most cases, because a `qmake -r'
would have created the necessary makefiles already. The problem is revealed
when a .pro file does SUBDIRS+=foo.pro and foo.pro is also a subdirs project.
Reviewed-by: Michael Goddard
|
|
|
|
|
|
|
|
| |
change b37ac454832a23c17418f5ebca8928b63fe02289 changed sis file names
from qt_debug-armv5.sis to qt.sis
This updates the runonphone make target to the new sis file name
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.
Task-number: QT-2909
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
| |
QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Prj_extensions tag is replaced with prj_testextensions tag when
CONFIG contains symbian_test
Task-number: QT-2985
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
| |
Deploy everything currently deployed under /epoc32/winscw/c to also
under /epoc32/data/z to make is easier to deploy applications to ROM.
Also changes path separators in deployment generation to be Linux
friendly.
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
| |
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
It breaks non-Symbian platforms.
|
|
|
|
|
|
|
|
|
|
|
| |
This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
| |
We should always use forward slash as a directory separator in include
paths - it's not OS dependant.
Task-number: QTBUG-8308
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed some global QIcon/QPixmap instances that leaked handles on X11.
Speed up QListView test
QListView: fix crash when hiding many of the lasts item in a QListView
Fixed warnings and crash when painting graphics effects outside scene.
Stabilize QLineEdit test on X11
(sqlite) Allow shared cache mode
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Fixed bug where GL widget was not fully updated on Vista.
|
| |
| |
| |
| |
| |
| |
| |
| | |
On a 64 bit system the old code used to make; UID "0xEffffffff9d8cb14". Which
doesn't get accepted by the symbian tool chain ;) The patch makes this normal
size hex uid3 again.
Reviewed-by: Miikka Heikkinen
|
|/
|
|
|
|
|
|
|
|
|
|
| |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
|
|
|
|
| |
Task-number: QTBUG-7908
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them
Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.
This commit is still missing properly signed bootstrap.sis package.
Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant examples: Fix missing QLatin1String.
Added Czech translations.
Webkit: Fix missing namespace.
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| |
| |
| |
| |
| |
| | |
missing braces, parens and spaces denoting empty loop bodies
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| | |
also fixes a warning
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ensures consistent handling of CONFIG values.
this is incompatible with 4.6.1, as it removes case-insentitivity from
some of the config keys, but those pro files wouldn't be portable beyond
symbian anyway, and symbian compatibility guarantees start with 4.6.2.
Reviewed-by: mariusSO
|
|/
|
|
|
|
|
|
|
|
|
|
| |
DEPLOYMENT.manufacturers variable can be used to define manufacturer
identifiers.
DEPLOYMENT.manufacturers.fail_note variable can be used to define
a file that contains the text to be shown in case of failed
manufacturer check.
Task-number: QTBUG-7695
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/|
| |
| | |
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| |
| | |
The include meant to be under restore_build was getting included always.
This is actually how it should work, so removed the empty restore_build
target entirely.
Reviewed-by: Janne Anttila
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
The .make.cache file contents are ignored if QT_SIS_TARGET environment
variable is set, so there is no point in requiring its existence in
those cases.
Task-number: QTBUG-4617
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
| |
Also fixed sbsv2 build targets 'make release' and 'make debug'.
Task-number: QTBUG-5156
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Some misc whitespace got fixed, too.
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
| |
There was no need to have SymbianSubdirsMetaMakefileGenerator in
cross-platform metamakefile.cpp, so moved the Symbian specific
functionality to symmake.cpp as suggested by qmake reviewers.
Task-number: QT-822
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Added GCCE as a compiler in SymbianMakefileGenerator::writeMmpFileCompilerOptionPart
Task-number: QT-1163
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
| |
The target path for binaries (.path configuration) in the DEPLOYMENT
section of a .pro file now works for binaries as well as for resources.
Path on device is still forced to /sys/bin
Default path is still !:/sys/bin
This can be used to force a binary to be installed on system drive by
setting the path to "c:/sys/bin" or "$:/sys/bin" (for S60 3.2+)
Reviewed-by: Iain
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Renaming done based feedback.
Reviewed-by: TrustMe
|