summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/symbian
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-1/+8
| | |\
| | | * Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
|/ / / | | | | | | | | | | | | | | | | | | Clearing epocroot_prefix at the end of the file caused it to be empty at the time replacement functions were resolved. Reviewed-by: Janne Koskinen
* | | Make the 'freeze' target work for linux/symbian.Thomas Zander2010-05-191-3/+3
| | | | | | | | | | | | | | | Users can type 'make freeze' to get the def files updated right in the git source tree
* | | Add 'runonphone' target for symbian / makefileThomas Zander2010-05-121-0/+9
|/ / | | | | | | | | | | This new target simply takes a sis file and runs the app on phone. Reviewed-by: Shane Kearns
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-15/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | Removed the --export_all_vtbl from linking.axis2010-05-031-2/+4
| | | | | | | | | | | | | | | | | | It causes wrong exports. This required rearranging some libraries to avoid undefined symbols.
| * | Cleaned up the elf2e32 options a bit.axis2010-05-031-13/+24
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-021-10/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| * | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-301-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake variables would have been exported to the command run by $$system() and - optionally - to the command run by system(). however, this was a unix-only feature and made the kernel barf at the huge environment on older linuxes. as we don't like platform-specific hacks which are unreliable, in particular when a workaround exists (the commands execute shell code after all, so one can inject arbitrary env variables), just blow it away - it was undocumented, after all. Reviewed-by: joerg
* | | Fix desktopservices demo missing icon in SymbianMiikka Heikkinen2010-04-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian abld toolchain cannot handle very long paths for mifconv source images, so do not absolutize the path. This should not be a problem, as the absolute icon path is only needed for shadow builds, which are not supported in symbian-abld anyway. Task-number: QTBUG-10135 Reviewed-by: Thomas Zander
* | | Make symbian-resource files aware of libInfix configure featureThomas Zander2010-04-291-3/+3
|/ /
* | Fix check for arm based systemsThomas Zander2010-04-161-2/+2
| | | | | | | | The lib is only on the phone, so check the dso file instead.
* | Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-081-5/+13
| |
* | Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
| |
* | Various fixes for symbian/gcce building.Thomas Zander2010-04-071-12/+20
| |
* | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| |
* | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| |
* | Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+1
| | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-3/+7
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
* | Fixed regular expression matching.axis2010-03-231-1/+1
| | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
* | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| |
* | Make ICON generation (to symbian mif) work for relative paths/shadow buildsThomas Zander2010-03-221-0/+2
| |
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Switched out QT_SOURCE_TREE, which is not defined for user apps.axis2010-03-221-1/+1
| |
* | Fixed Symbian applications with DESTDIR set.axis2010-03-161-1/+1
| |
* | Removed a warning about generated rss files.axis2010-03-162-28/+53
| | | | | | | | | | | | Also cleaned up the "clean" and "distclean" targets a bit. Task: QTBUG-8854
* | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-162-0/+15
| | | | | | | | RevBy: Miikka Heikkinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-162-55/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
generated by cgit v0.12 at 2025-01-31 07:05:00 (GMT)