summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/symbian
Commit message (Collapse)AuthorAgeFilesLines
* Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-042-18/+5
| | | | | | | | | 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
* Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | RevBy: Liang Qi
* Fixed library ordering when linking to qtmain.axis2010-10-041-2/+7
| | | | | Done-with: Liang Qi Reviewed-by: Trust me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-301-2/+22
|\ | | | | | | | | | | | | | | | | 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
| * Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-301-2/+22
| | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-301-5/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Call createpackage without the explicit .bat suffixMartin Storsjo2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | 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>
| * Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-1/+0
| | | | | | | | | | | | | | | | | | 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>
* | Streamlined smart installer package creationMiikka Heikkinen2010-09-271-2/+2
|/ | | | | | | | | | | | 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
* QTBUG-4852 Turning on runtime nested exception support where availablemread2010-09-162-0/+9
| | | | | | | | | | | | | | | | | | | | | 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
* Added support for using -L notation in the LIBS variable.axis2010-09-141-4/+10
| | | | | Task: QTBUG-13523 RevBy: Thomas Zander
* Eliminated duplicated code from library handling.axis2010-09-141-16/+10
| | | | RevBy: Trust me
* Moved the sis_targets feature profile to the correct directory.axis2010-09-101-0/+201
| | | | RevBy: Trust me
* Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-033-52/+39
| | | | | | | | | 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
* make various POST_LINK steps nicerOswald Buddenhagen2010-08-311-11/+2
| | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
* Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-0/+21
| | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* Fix run and runonphone targets for projects that have TARGET with pathMiikka Heikkinen2010-08-061-3/+5
| | | | | | | Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis
* Switched from using hardlinks to copies in Symbian building.axis2010-08-031-1/+1
| | | | | | | | | | | 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
* Included libstdcppv5 support for the makefile build system.axis2010-08-031-7/+13
| | | | RevBy: Miikka Heikkinen
* Prevented makefile build system from using platform provided paths.axis2010-08-031-2/+5
| | | | | | | | | 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
* Fixed a problem with dso dependencies.axis2010-07-291-19/+21
| | | | | | | | | | | 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
* Revert "Fixed a parsing error during sis and runonphone target creation."axis2010-07-281-1/+1
| | | | This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
* Added silent behavior to the most important Symbian build steps.axis2010-07-221-0/+5
| | | | | Task: QTBUG-11927 RevBy: Trust me
* Fixed compiling with symbian/linux-armcc and configure -silent optionaxis2010-07-221-1/+1
| | | | | Task: QTBUG-11927 RevBy: Trust me
* Removed some warnings from armcc that are unneeded.axis2010-07-221-1/+10
| | | | RevBy: Trust me
* Made the makefile build system use QMAKE_CFLAGS.xxx properly.axis2010-07-221-0/+8
| | | | | | | 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
* Fixed a parsing error during sis and runonphone target creation.axis2010-07-211-1/+1
| | | | RevBy: Trust me
* Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-022-9/+17
| | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
* Symbian on Linux: $QTDIR/bin is not necessarily in the path.Olivier Goffart2010-07-011-2/+4
| | | | | | | | | | | 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
* Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-292-52/+55
|\ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf
| * Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | | | | | | RevBy: Miikka Heikkinen
| * Fixed Symbian resources not honoring TARGET with a path.axis2010-06-291-51/+53
| | | | | | | | | | Task: QT-3540 RevBy: Thomas Zander
* | Removed useless comments.axis2010-06-291-4/+0
|/ | | | Not relevant anymore after 5b5ae51b22b.
* Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.axis2010-06-241-2/+4
| | | | RevBy: Trust me
* Fixed make runonphone that looked for the package in the wrong place.axis2010-06-241-3/+7
| | | | | Task: QTBUG-11670 RevBy: Trust me
* Fixed several problems with the postlinker for Symbian (elf2e32).axis2010-06-242-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fixed memory restrictions not being passed on to elf2e32.axis2010-06-241-0/+7
| | | | | Task: QTBUG-11351 RevBy: Trust me
* Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-221-2/+0
| | | | | | | | | 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
* Fix symbian building of TARGET with a slashThomas Zander2010-06-151-2/+2
| | | | | | | 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
* Added prependEpocroot replacement function to platform_paths.prfMiikka Heikkinen2010-06-141-1/+19
| | | | | | | | | | | | | | | | This function can be used to do smart prepending of epocroot to paths defined by platform_paths.prf, though it'll work for any string. This is useful because paths defined in platform_paths.prf can start either with full epocroot or just slash depending on environment. E.g. exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(foobar.h))) { ... } Reviewed-by: Janne Koskinen
* Moved runonphone target to prf files for all build systems.axis2010-06-111-6/+23
| | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
* Fixed destdir not being defined.axis2010-06-101-0/+4
| | | | | | Local variables can't be counted upon between different profiles. RevBy: Trust me
* Enable runonphone target for libraries as well.axis2010-06-101-2/+3
| | | | RevBy: Miikka Heikkinen
* Explicit EXPORTUNFROZEN will prevent default defBlock generationMiikka Heikkinen2010-06-102-2/+3
| | | | | | | If MMP_RULES contains EXPORTUNFROZEN, no DEFFILE statements should be generated to mmp files. Reviewed-by: Janne Koskinen
* Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-042-1/+4
| | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
* Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-275-14/+14
|\ | | | | | | | | Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.h
| * escape backslashesOswald Buddenhagen2010-05-265-14/+14
| | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | | | | | | | | | | | QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR paths had double slash in front of them. Reviewed-by: Janne Koskinen
* | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-211-1/+8
|\ \ | |/ | | | | | | Conflicts: src/corelib/global/qglobal.h
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-211-1/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more