| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTPROD-875
Reviewed-by: Miikka Heikkinen
|
|/
|
|
|
|
|
|
| |
Files specified in QMAKE_CLEAN variable will now be properly
cleaned in symbian-sbsv2 builds.
Task-number: QTBUG-17004
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
| |
Mif file cleaning was incorrectly done at distclean phase.
Task-number: QTBUG-16893
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Make it possible to freeze def files via makefile targets.
Task-number: QTBUG-13769
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Variable currentClause is no longer used for anything, so removed
its declaration.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
| |
Qt Creator depends on some of the information generated into the
makefile header by MakefileGenerator::writeHeader() function, so
changed symmake*.cpp to use it instead of each having separate
code for header generation.
Task-number: QTBUG-15539
Reviewed-by: Janne Koskinen
|
|
|
|
|
| |
Task-number: QTBUG-15393
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If developer specifies "CONFIG += localize_deployment" in .pro file,
the generated .loc and .pkg will now use translatable strings from
.ts files defined in TRANSLATIONS. The .ts files must have an
underscore and Qt language code at the end of the filename body
to be compatible with deployment localization. E.g. myapp_en.ts.
Running lupdate will generate these entries into .ts files:
- Application short caption
- Application long caption
- Package name
- Smart installer package name
Task-number: QTBUG-13917
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Janne Anttila
Reviewed-by: axis
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Doc: Fixing typo
Doc: Fixing typo
Fixed tst_qwidget::testContentsPropagation auto-test failure.
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The default package name and the default name that appears in
the application menu is derived from the TARGET variable.
Often the default is not optimal for displaying to end user.
To set a better display name for these purposes DEPLOYMENT.display_name
variable can now be used.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf
Task-number: QTBUG-15068
Task-number: QTBUG-14280
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The .flags modifier can be used to specify pkg flags for files.
For example, to make default application run after install:
default_bin_deployment.flags += FR RI
For example, to show a note at installation time:
notedep.sources = install_note.txt
notedep.flags = FT TC
DEPLOYMENT += notedep
See Symbian package file format documentation for exact supported
flag values.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 494ce0dac35c7ade0ce78589878597a7ca912864
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: axis
Conflicts:
qmake/generators/symbian/symbiancommon.cpp
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.
Also clarified documentation of these variables.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: a537137fffd72d153a35828228c00567a563e787
Task-number: QTBUG-15068
Task-number: QTBUG-13159
Reviewed-by: axis
Conflicts:
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.qdoc
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
cp on unix doesn't create the destination directory if it doesn't exist,
as xcopy on windows does.
This also requires QMAKE_MKDIR to use mkdir -p to be able to create
directories recursively.
Merge-request: 861
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
flag
Also include -R in the linux version of the command, so that it is able to
copy files recursively, which xcopy on windows is able to, if that is
relied on somewhere.
Merge-request: 861
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
The destination path in pkg files always uses backslashes, not
the path separator native to the build system.
Merge-request: 853
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
This patch fixes the deployment of files when using Qt For Symbian SDK
on Linux.
Merge-request: 839
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Add declarative changelog entries for 4.7.1
connman backend
My changelog entries for 4.7.1
updated changes-4.7.1
Update frameGeometry when the unified toolbar visiblity is toggled
Update changelog
my contributions to dist/changes-4.7.1
My 4.7.1 changes.
added my and Jan-Arve's change to changelog for 4.7.1
Changes done for 4.7.1
Updated changes-4.7.1
My changes.
Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example
Initialise pointer variables.
An aborted QNetworkSession on Maemo must emit SessionAbortedError.
Autotest: also enable testing of QtDeclarative
Add Qt 4.7.0 baseline symbols to the 4.7 branch
Call createpackage without the explicit .bat suffix
Improve Qt/Symbian compatibility with unix shells
Ukrainian translation updated
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove an "echo." call that doesn't work on unix, and make the
create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS
requires an || before the command to execute on unix shells).
Merge-request: 823
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Previously manual editing of the pkg file was required to publish
application using smart installer. Now a proper app_installer.pkg
will be created as long as application has protected range UID.
Also changed "make installer_sis" to always generate the application
sis as publishing process supports signing both application and its
smart installer wrapper packages in single step.
Task-number: QTBUG-13991
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_RVCT_VERSION environment variable can be used to specify
the desired RVCT version for symbian-sbsv2 Makefiles:
E.g. QT_RVCT_VERSION=4.0, release-armv6 -> sbs -c arm.v6.urel.rvct4_0
If no version is specified, generic sbsv2 rvct aliases are used just
like before:
E.g. release-armv6 -> sbs -c armv6_urel
Version specific make targets are also generated for each detected
compiler:
E.g. release-armv6-rvct4.0 -> sbs -c arm.v6.urel.rvct4_0
Also optimized finding the installed compiler versions.
Task-number: QTBUG-13499
Reviewed-by: axis
|
|
|
|
|
|
|
|
| |
Renaming makefile makes little sense for Symbian toolchains, when
we generate so many other files filenames derived from other sources.
Task-number: QTBUG-13336
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- No longer require PRE_TARGETDEPS items to be absolute, which was
difficult to achieve sometimes as qmake doesn't provide method
for absolutizing paths.
- Do smart command replacement for commands containing $$QMAKE_*
command variables, such as $$QMAKE_COPY, when generating bld.inf
extensions for QMAKE_EXTRA_* variables.
$$QMAKE_* command variables cannot be passed to sbsv2 toolchain
directly, as it uses cygwin in windows, and they can't simply
be replaced to use sbsv2 equivalents in symbian.conf, because
generated wrapper makefiles need them to be Windows compatible.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
Plenty of filenames got generated with spaces which didn't work
as that was not taken into account. Harmonized TARGET fixing
across prf files and qmake Symbian generator code.
Task-number: QTBUG-13363
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
| |
Removed usage of buggy .release_gcce target from symbian-sbsv2
generated makefiles. Now gcce builds like armv5 as it is supposed to
when using Raptor.
Task-number: QTBUG-13307
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
DEPLOYMENT.pkg_build_version can be used to pad the patch version
number in Symbian pkg files to allow hot-fix deployments to be done
between patch releases.
DEPLOYMENT.pkg_build_version accepts only values 0 - 99, as pkg patch
version number has limits how large numbers it can accept. The specified
number is prefixed with zero if it is single digit and then appended
to patch version number.
Task-number: QTBUG-13147
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
| |
Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths
instead.
Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
| |
Changes to .pro file weren't previously noticed and therefore
qmake wasn't rerun. Qmake command itself was also incorrect.
Task-number: QTBUG-12716
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
| |
It is now possible to use "release-gcce" and "debug-gcce" targets
in symbian-sbsv2 mkspec. Exports and cleans should also now work
properly for all target platforms under symbian-sbsv2.
Task-number: QTBUG-12762
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mmp and mk files previously contained UID3 as unique identifier in
the filename. However, this was not particularly useful for building
subprojects in massive project trees such as Qt, as it was difficult
to remember UID for each subproject. Now with intuitive naming of mmps,
it is possible to build a subproject like this:
sbs -c armv6_urel -p qtcore_dll.mmp
Task-number: QTBUG-12715
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
| |
Missing minor or patch value from VERSION caused malformed pkg header
to be generated.
Task-number: QTBUG-12617
Reviewed-by: axis
|
|
|
|
|
|
|
| |
Pre-built resources didn't get properly copied under \epoc32\data\z.
Task-number: QTBUG-11519
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Precompiled binaries were not copied under /epoc32/data/z to support
deployment properly.
Task-number: QTBUG-11519
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
| |
Since sbsv2 toolchain supports having sources and SDK on different
drives, $${EPOCROOT} needs to contain drive letter to make it work.
Reviewed-by: Jason Barron
|
|
|
|
|
|
| |
This reduces code duplication.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
| |
For security reasons, it is better to install application packages
into the private directory of the smart installer rather than
a public directory.
Task-number: QTBUG-11288
Reviewed-by: Aleksandar Sasha Babic
|
|
|
|
|
|
| |
Previously it would not use the autogenerated def files.
RevBy: Thomas Zander
|