| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Original implementation assumed createpackage script was always run
from under Qt source tree bin directory, which is not always the case
as on some platforms the Qt tools can be found from under EPOCROOT.
Fixed it so that if the default directory for default certificates
can't be found in the expected location, createpackage will attempt to
query qmake in the same directory as the createpackage script for the
location of the Qt source tree (QT_INSTALL_PREFIX) and look for default
certificates directory from under there.
Task-number: QTBUG-18684
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Temporary files created by these two scripts will now be created
under a separate directory, contents of which is also added to cleanup.
Task-number: QTBUG-11394
Reviewed-by: axis
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Some tools calls required epoc32/tools to be in path and some didn't.
Now all tools calls will use tools from under %EPOCROOT%epoc32/tools
if EPOCROOT env variable is defined.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Automatic patching was modifying all package files in ways that
only made sense for very limited set of projects. Some things were
also no longer necessary due other developments, so dropped
the dependency, embedded sis, and manufacturer check modifications.
Also provided an option to do a self-signed compatibility
check for the package instead of patching it automatically by
specifying "-d" parameter in QT_SIS_OPTIONS env variable
or createpackage command line, depending on how package is made.
Task-number: QTBUG-15561
Reviewed-by: axis
|
|
|
|
|
|
|
|
| |
Before this fix, creating stub sis failed if epocroot was simply a
forward slash. Mixing forward slashes and backslashes also caused
issues.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.
Task-number: QTBUG-13902
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
|
| |
All of the assigned capabilities of executables are likely to be
actually needed unlike those of dlls, so do not create a patched
sis for an application with non-self-signable capabilities.
Similarly block creation of a patched package if any executable has
a protected range SID, as installer will refuse to install such a
package anyway.
Task-number: QTBUG-13886
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
| |
The makefile build system does not require EPOCROOT to end in a
slash.
RevBy: Jani Hautakangas
|
|
|
|
| |
Reviewed-by: Jani Hautakangas
|
|
|
|
|
|
| |
when using EPOCROOT that contains drive letter.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
RevBy: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
| |
Rationale for this is that currently there is no simple way to create
a sis package that can be properly signed via Symbian open signed
mechanism, as 'make sis' will by default use self-signed certificates
and automatically patch capabilities of binaries to remove
non-self-signable ones.
Task-number: QTBUG-11455
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
<app>_installer.pkg produces self-signable packages by default, so
no need to patch it.
Task-number: QTBUG-10746
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Convert paths in DEPLOYMENT to the rom drive (z:)
Filter out unwanted parts of the header (dependencies)
Task-number: QTBUG-10118
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
| |
The -n parameter can be used to specify the final sis name when
using createpackage script or "make sis" with QT_SIS_OPTIONS.
Task-number: QTBUG-9400
Reviewed-by: Janne Koskinen
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Don't autopatch when just preprocessing pkg or creating stub package
- Copy binaries before patching so that originals are preserved.
- Only autopatch the preprocessed file so that original template is
preserved.
- Added clear warning to patch_capabilities.pl to notify users that
patched package is not suitable for distribution.
Task-number: QTBUG-9972
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
| |
This was due the patch_capabilities step running too late in the sis
creation process. This led to the package ID being wrong the first
time "make sis" was run, but correct on subsequent runs.
RevBy: Trust me
Task: QTBUG-8770
|
|
|
|
|
|
|
|
|
| |
This allows you to simply call 'make ok_sis' to have a sis package
which is self signed with patched capabilities, ready for install
on an consumer system.
Reviewed-by: Shane Kearns
(cherry picked from commit 1f9e501bf9f3287a424b36915d4436a74cf21847)
|
|
|
|
|
| |
Not strictly necessary for normal building, but nice to catch build
system bugs.
|
|
|
|
| |
This does not work well on case sensitive file systems.
|
|
|
|
|
| |
This was done in order to support signsis on Linux, where relative
paths are required.
|
| |
|
|
|
|
|
| |
This change was done in order to support build systems that do not
use platform and target in the pkg file.
|
|
|
|
|
|
| |
This is a better sentence and has the added benefit of not confusing
emacs' highlighting, causing the last quote mark to generate a string
running through the rest of the file. ;-)
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed the host detection in qmake profiles.
Improving parts of commit 2d8d855d.
qmake: add Linux host support to Symbian generator
Fixed indentation.
Add Linux host support to Symbian mkspecs.
Linux support for platform specific commands in .pro files.
Add createpackage.bat equivalent for Unix systems.
Make all Symbian #includes lower case.
mkspecs: fix warning when calling qmake
Fix portability problems in bin/createpackage.pl.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Use File::Spec functions to manipulate path components.
* Keep $targetplatform lower case for case sensitive systems.
Signed-off-by: axis <qt-info@nokia.com>
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
| |
Moved the certificate/key to the src/s60installs path.
Updated createpackage.pl to look in this new location.
Task-number: QTBUG-4553
Reviewed-by: axis
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit extends createpackage with capability to sign the SIS
file with several certificates. The certificates need to be listed
in text file. The file can have several certificates, each specified in
separate line. The certificate, key and passphrase in line must be ';'
separated. Lines starting with '#' are treated as a comments. Also
empty lines in the file are ignored. The paths in certificate info file
can be absolute or relative to the given file.
Example syntax for certificateinfo file (mycerts.txt):
# This is comment line, also the empty lines are ignored
rd.cer;rd-key.pem
.\cert\mycert.cer;.\cert\mykey.key;yourpassword
X:\QtS60\selfsigned.cer;X:\QtS60\selfsigned.key
To use this file the creatapackage has to be invokes as follows:
createpackage.pl -c=mycerts.txt templatepkg release-armv5
Reviewed-by: Shane Kearns
Reviewed-by: Miikka Heikkinen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
All S60 SDK paths in Linux are lowercase.
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
The prerocessing is needed by installer scripts.
Reviewed-by: Miikka Heikkinen
|