summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-17122-1504/+2869
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits) Fix dependency so it works also on massive parrallel systems This should likely get webkit linking again on windows/sbsv2 Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-17122-1504/+2869
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits) Fix dependency so it works also on massive parrallel systems This should likely get webkit linking again on windows/sbsv2 Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always ...
| | * Fix dependency so it works also on massive parrallel systemsThomas Zander2010-03-171-0/+1
| | |
| | * This should likely get webkit linking again on windows/sbsv2Thomas Zander2010-03-171-0/+1
| | | | | | | | | | | | Reinstate the MMP rule as this block is for sbsv2 only anyway
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-17121-1504/+2867
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-17121-1504/+2867
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-16121-1504/+2867
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| | | | | * 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
| | | | | * Revert "Temporarily disable problematic dll."axis2010-03-161-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a65738d8e81f165e32d948ffbaea98702717d8db.
| | | | | * Fixed "Cannot install protected application" message on Symbian.axis2010-03-161-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * Worked around a crash in the elf2e32 postlinker tool.axis2010-03-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander
| | | | | * Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-1611-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | | * Enabled compilation of plugins again.axis2010-03-162-0/+2
| | | | | |
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-16197-1461/+2407
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | Fixed a building bug where the DLL entry point was undefined.axis2010-03-153-2/+3
| | | | | | |
| | | | | * | Moved UID2 processing from cpp code to profiles.axis2010-03-152-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
| | | | | * | Merge branch 'master' of ↵axis2010-03-15110-1426/+2720
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/kamlies-qt-s60-linux-mkspec into 4.7-s60
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1554-298/+587
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Added rpp and rsg files to ignore filter.axis2010-03-111-0/+2
| | | | | | | |
| | | | | | * | Moved two profiles to the correct directory.axis2010-03-112-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets applications building again.
| | | | | | * | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-117-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent sym_iap_util.h change make it depend on different libraries. Fixed LIBS statements on relevant examples and demos. Reviewed-by: Janne Anttila
| | | | | | * | Temporarily disable problematic dll.axis2010-03-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be reverted later, and investigated.
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111249-26175/+49551
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| | | | | | * | | Use the same concept for per-lib tweaks as armccThomas Zander2010-03-093-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the compiler specific options in gui.pro and WebCore.pro are only for the mmp based build systems. Lets make that clear and mark them as such.
| | | | | | * | | Consistently use the * in configureThomas Zander2010-03-091-1/+1
| | | | | | | | |
| | | | | | * | | Symbian doesn't have large file support currently, just turn it offThomas Zander2010-03-091-0/+2
| | | | | | | | |
| | | | | | * | | Remove largefile config testThomas Zander2010-03-093-94/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somewhere in 2005 the code was changed to no longer run the exe but just to compile it which means that as soon as the simple exe compiled large file support was set to true. Removing the complexity and just setting the default to true in the configure script sounds like the honest thing to do :)
| | | | | | * | | Make sure that we have all compile flags available alwaysThomas Zander2010-03-097-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may do a CONFIG -= qt which means that the qt.prf won't be loaded. So, lets make sure we don't have any critical properties in those files.
| | | | | | * | | Enabled dependencies for .dso and .lib libraries only.axis2010-03-092-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for .lib files, as well as removes support for all others than .dso and .lib. This builds on the original commit bdff51768dfe.
| | | | | | * | | Merge branch 'defFilesAndMisc'axis2010-03-0810-56/+172
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian-makefile.conf mkspecs/symbian/features/symbian_building.prf
| | | | | | | * | | Switched to using DEF_FILE, which is the official variable.axis2010-03-081-1/+1
| | | | | | | | | |
| | | | | | | * | | Added Symbian def file support to Linux build system.axis2010-03-088-33/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
| | | | | | | * | | Enabled conditional updating of dso files.axis2010-03-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves rebuilding of components that depend on the current one, by not updating the dso file unless it has changed.
| | | | | | | * | | Added dso dependencies to Symbian targets.axis2010-03-022-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for correct intermodule building when def files are off, since otherwise the ordinals present in the DLLs and the ordinals linked to may be different. In layman's terms: If you build QtCore, QtGui will also trigger rebuilding as a result of that.
| | | | | | | * | | Reversed order of user QMAKE_POST_LINK statements and generated ones.axis2010-03-021-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the users' statements would run before the binary was fully linked.
| | | | | | * | | | Fix src!=build issueThomas Zander2010-03-041-1/+2
| | | | | | | | | |
| | | | | | * | | | Do the correct thing for make sis for webkitThomas Zander2010-03-041-1/+1
| | | | | | | | | |
| | | | | | * | | | Make the symbian_building.prf be shared fileThomas Zander2010-03-027-251/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fork I made for gcce is similar enough to now be shared between gcce and armcc so move stuff around a bit to avoid the code duplication.
| | | | | | * | | | Merge branch 'master' into gcceThomas Zander2010-03-023925-243026/+366534
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Added gitignore rules for Symbian plugins.axis2010-03-011-0/+2
| | | | | | | | | |
| | | | | | | * | | Fixed location of dll for the makefile based Symbian build system.axis2010-03-011-1/+1
| | | | | | | | | |
| | | | | | | * | | Made header inclusion Linux friendly.axis2010-03-011-1/+1
| | | | | | | | | |
| | | | | | | * | | Corrected a mismerge by Git.axis2010-03-011-1/+1
| | | | | | | | | |
| | | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-012625-144423/+192734
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| | | | | | | * | | | Added wrapper for patch_capabilities on non-Windows platforms.axis2010-03-011-0/+3
| | | | | | | | | | |
| | | | | | | * | | | Made redirection to /dev/null cross platform.axis2010-03-011-1/+4
| | | | | | | | | | |
| | | | | | | * | | | Made patch_capabilities.pl not raise capabilities unnecessarily.axis2010-03-011-12/+40
| | | | | | | | | | |
| | | | | | | * | | | Make createpackage.pl auto-patch the capabilites for self signed packagesMarius Storm-Olsen2010-02-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | | | | | | * | | | Switched the order of message and execution in patch_capabilities.axis2010-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems more natural to have the message first, so that you can tell which file is taking long to complete.