summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-abld
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-0/+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
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-0/+43
| |\ | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| | * Added forwarding headers for qplatformdefs.h in Symbian mkspecsMiikka Heikkinen2010-03-101-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | Missing qplatformdefs.h file caused configure to fail on Linux environments. Part of QtP delta reduction effort. Reviewed-by: axis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-261-0/+1
| |/ | | | | | | Reviewed-by: mariusSO
* | Reorganized the Symbian build system profiles.axis2010-01-121-1/+1
|/ | | | | | Now we try share as much as possible between the different Symbian build systems, so that changes made to the MMP systems will also work in the makefile based one.
* Long live Qt for S60!axis2009-04-241-0/+9