summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-149-4/+10
|\
| * Avkon removal configured with -no-s60mread2010-07-011-2/+2
| * Change the files to camelcase as avkon now does thatThomas Zander2010-06-257-0/+8
| * Fixed memory restrictions not being passed on to elf2e32.axis2010-06-241-2/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-0/+5
|\ \ | |/
| * Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-221-0/+5
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-185-14/+35
|\ \ | |/
| * Moved runonphone target to prf files for all build systems.axis2010-06-112-2/+1
| * Fixed S60_VERSION variable exists checksMiikka Heikkinen2010-06-031-8/+14
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-032-8/+11
| |\
| | * Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-022-8/+11
| * | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| |/
| * escape backslashesOswald Buddenhagen2010-05-262-4/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-141-0/+1
| |\
| | * Add 'runonphone' target for symbian / makefileThomas Zander2010-05-121-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-121-1/+1
| |\ \ | | |/ | |/|
| | * Support updating system locale data on SymbianDenis Dzyubenko2010-05-031-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-031-1/+7
| |\ \ | | |/ | |/|
| | * Cleaned up the elf2e32 options a bit.axis2010-05-031-1/+7
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-107-16/+23
|\ \ \ | |/ /
| * | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-305-5/+5
| |/
| * Fix default_deployment.pkg_prerulesMiikka Heikkinen2010-04-202-11/+18
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2112-94/+195
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-1/+1
| |\
| | * Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-121-1/+1
| * | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-301-7/+0
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-251-5/+2
| | |\ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+1
| | |\ \ \
| * | \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-1/+10
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-1/+4
| | | |/ | | |/|
| | * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+7
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-221-5/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-211-5/+2
| | |\ \
| | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1912-87/+184
| | | |\ \
| | | * | | Add flag to indicate that network sessions are expected on a platform.Aaron McCarthy2010-03-181-3/+0
| | | * | | Bugfix the Symbian implementationThiago Macieira2010-03-171-2/+2
| * | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-1/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-1/+5
| * | | | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1712-87/+184
| |\ \ \ | | |_|/ | |/| |
| | * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-166-0/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-2/+5
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-113-2/+8
| | |\ \ \
| | * | | | Symbian doesn't have large file support currently, just turn it offThomas Zander2010-03-091-0/+2
| | * | | | Merge branch 'defFilesAndMisc'axis2010-03-081-0/+2
| | |\ \ \ \
| | | * | | | Added Symbian def file support to Linux build system.axis2010-03-081-0/+1
| | * | | | | Make the symbian_building.prf be shared fileThomas Zander2010-03-021-0/+19
| | * | | | | Merge branch 'master' into gcceThomas Zander2010-03-022-13/+14
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-2/+3
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-11/+11
| | | |\ \ \ \ \