| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Qt applications built against Symbian3 SDK will not run on older
devices, so remove the platform dependency to those devices so that
the user will get a proper warning if he tries to install incompatible
software to an older device.
Task-number: QTBUG-17187
Reviewed-by: Janne Koskinen
(cherry picked from commit 822151edc065dc89ed331e91e02fb8014ef3ecee)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 4ec245a3e75470186557d00b2383af3872a720b0)
|
|
|
|
| |
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
| |
Removed the unnecessary checks for the case where pkg file doesn't exist
are no longer needed as we now have dependencies to pkg files and no
sis creation targets are generated if pkg is not generated.
Also improved documentation a bit and added the missing
ok_installer_sis target generation.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Added missing Symbian language codes for which an Qt equivalent was
available. Some codes were mapped to language/country pairs.
Task-number: QTBUG-15293
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding
include path that points under mkspecs.
Task-number: QTBUG-15501
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
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.
Task: QTBUG-14735
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334.
It breaks massively on the symbian/linux-armcc mkspec. Will find a
different solution.
|
|
|
|
|
|
|
|
|
| |
Using Open C's libcrt0.lib to provide entry point caused problems
for applications that launched other processes, as Open C retains a
handle to all launched processes even after said processes terminate.
Task-number: QTBUG-14735
Reviewed-by: axis
|
|
|
|
| |
RevBy: Liang Qi
|
|
|
|
|
| |
Done-with: Liang Qi
Reviewed-by: Trust me
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for unsigned smart installer package creation in Symbian
Fix QApplication::desktop()->availableGeometry() for Symbian
QS60Style: Possible NULL pointer use when drawing frame
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On windows, the .bat file is implicitly called, on unix the "createpackage"
shell script wrapper is called instead.
The symbian-sbsv2 mkspec already calls createpackage without any suffix.
Merge-request: 823
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added nested_exceptions.prf to the symbian mkspecs features, and used
it from the stl.prf config.
nested_exceptions.prf adds the .mmp flag to use the nested exceptions
runtime support library for apps.
stl.prf will add nested_exceptions to the config when the support
library is present. Since this check depends on the existence of the
runtime support library when qmake is run, qtp will have to add
nested_exceptions to their config when building with nested exception
support.
This change means that, where nested exceptions are supported on
Symbian, apps will no longer crash if a nested exception is encountered
at runtime.
Task-number: QTBUG-4852
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
| |
Task: QTBUG-13523
RevBy: Thomas Zander
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
put each step into a separate make command.
that makes for cleaner output and less troubles with command separators.
Reviewed-by: mariusSO
|
|
|
|
|
| |
Task-number: QT-2139
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
| |
Sis files are always generated in the pro file directory even if
TARGET indicates another target directory.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
| |
The problem with hardlinks is that things start to behave funny when
you build several times, because on the next compile, the target from
armlink is moved to the .sym file location, and in this case it will
be hardlinked too. In the end you have all three files (bare, .exe
and .sym) being hardlinked together, when the .sym should be an ELF
file and the other two should be an E32 image.
RevBy: Trust me
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
| |
Platform paths provided by Symbian do not provide the full path to
headers. Ideally they should be used, by looking for and replacing
/epoc32 with the correct path. However, for now this is a good enough
solution.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
Dependencies to dso files were not generated correctly, both because
the PRE_TARGETDEPS variable seems to be local to the function it was
in, and also because the regular expression was wrong (it has to
match the whole string).
Also switched to qt_ style variable names to avoid clashes.
RevBy: Trust me
|
|
|
|
| |
This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
|
|
| |
Previously, the variable would be appended too soon, so not all
values would be included. Now it is one of the last steps.
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11396
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
|
| |
| |
| |
| | |
RevBy: Miikka Heikkinen
|
| |
| |
| |
| |
| | |
Task: QT-3540
RevBy: Thomas Zander
|
|/
|
|
| |
Not relevant anymore after 5b5ae51b22b.
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11670
RevBy: Trust me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The fixes were too complicated for a profile and so a perl script was
introduced. These are the issues that were addressed:
- Made sure that we link correctly in all cases where there is a
mismatch between the DEF file and the ELF file. Specifically, these
two cases:
- If elf2e32 detects a symbols in the ELF file that is marked as
absent in the DEF file, an ordinal mapping will not be
generated in the dso file. This means that binaries linking to
the library will not find the symbol, even though it exists in
the code. Since this is completely useless behavior, this was
fixed to include the symbol regardless.
- If the DEF file contains a symbol that is not present in the
ELF file, an ordinal mapping will be created in the dso file
regardless, which means applications can link to a symbol that
does not exist. This is even worse than point one, since it is
not detected until runtime, when the dynamic link will fail.
Fixed by leaving the symbol out of the dso file if it does not
exist in the ELF file.
Both fixes require rerunning elf2e32 to fix the symbol mappings
that were broken in the first run, but it only happens if at least
one symbol is broken in the way described above. Also, freezing the
DEF files will "save" the symbols, so that it does not occur after
that.
Note that this does not remove the ability to get the postlinker to
tell you about mismatches. By doing
"QMAKE_ELF2E32_FLAGS -= --unfrozen", the symbol mismatches will be
considered errors instead of warnings, and they can be caught that
way.
- Code that was previously in the profile was moved to the perl
script:
- Detecting that there are errors in the postlink and return
nonzero. elf2e32 does not do this on its own (at least not when
using Wine).
- Only overwriting the old dso file if the new one is different.
This saves build time, since binaries that depend on the
library do not trigger relink if the dso has not changed.
These two points simplify the code, and they will also help the
porting to Windows, since the old shell script tricks would not
have worked there.
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11351
RevBy: Trust me
|
|
|
|
|
|
|
|
|
| |
These definitions are not platform dependent as they must be exactly
what configure sets for plugins and imports paths, so moved them
out of data_caging_paths.prf into symbian.conf.
Task-number: QTBUG-11619
Reviewed-by: axis
|
|
|
|
|
|
|
| |
In case there is a slash in the target (for example; ../foo) then we
don't want to add a faulty cxxflags to the compile line.
Reviewed-by: Axis
|