summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-222-11/+18
|\
| * Fix default_deployment.pkg_prerulesMiikka Heikkinen2010-04-202-11/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-181-1/+2
|\ \ | |/ |/|
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| * Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
* | Webkit got bigger, make it link again on armlinkThomas Zander2010-04-161-0/+1
* | Fix check for arm based systemsThomas Zander2010-04-161-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-142-4/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-122-4/+4
| |\
| | * Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-122-16/+36
| | |\
| | * | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-133-4/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Implement some changes to the AIX xlC mkspec suggested by IBM.Thiago Macieira2010-04-133-4/+10
* | | | 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
* | | Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-082-11/+14
* | | Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
* | | Various fixes for symbian/gcce building.Thomas Zander2010-04-073-17/+33
| |/ |/|
* | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-311-3/+4
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-302-7/+1
| |\ \
| * \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-292-4/+17
| |\ \ \ | | | |/ | | |/|
| | * | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-1/+4
* | | | 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-252-8/+2
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-232-8/+2
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-222-8/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-212-8/+2
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1934-357/+1023
| | | | |\ \
| | | | * | | Add flag to indicate that network sessions are expected on a platform.Aaron McCarthy2010-03-182-6/+0
| | | | * | | Bugfix the Symbian implementationThiago Macieira2010-03-171-2/+2
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-242-4/+14
* | | | | | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
* | | | | | Fixed regular expression matching.axis2010-03-231-1/+1
* | | | | | 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-224-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-1/+5
| * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
* | | | | Switched out QT_SOURCE_TREE, which is not defined for user apps.axis2010-03-221-1/+1
| |/ / / |/| | |
* | | | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| |_|/ |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-0/+2
|\ \ \ | |/ /
| * | Make sure target path exists in qmake_extra_pre_targetdep.flmMiikka Heikkinen2010-03-161-0/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1733-357/+1021
|\ \ \ | |_|/ |/| |
| * | Fixed Symbian applications with DESTDIR set.axis2010-03-161-1/+1
| * | Removed a warning about generated rss files.axis2010-03-162-28/+53
| * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-168-0/+21
| * | Enabled compilation of plugins again.axis2010-03-162-0/+2