summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-215-1/+14
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-215-1/+14
| |\
| | * Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | * Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | * fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
* | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-1910-32/+22
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-191-2/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-186-30/+47
| | |\ \
| | * | | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-179-30/+21
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | fix regexpOswald Buddenhagen2010-05-141-1/+1
| | * | fix QMAKE_QMAKE path separator under mingw+sh in the qmake specOswald Buddenhagen2010-05-141-0/+1
| | * | define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-148-30/+20
* | | | Make the 'freeze' target work for linux/symbian.Thomas Zander2010-05-191-3/+3
* | | | Fix generation of stub sis filesShane Kearns2010-05-141-1/+1
* | | | Re-enable suppression of --export_all_vtbl for static librariesIain2010-05-141-5/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-142-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Add 'runonphone' target for symbian / makefileThomas Zander2010-05-122-0/+10
* | | | 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
| | |/ | |/|
* | | Run autotests with minimal capabilitiesShane Kearns2010-05-101-1/+1
* | | Allow EPOCROOT env var to be without trailing slash.Thomas Zander2010-05-101-8/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-033-20/+37
|\ \ \ | |/ / |/| |
| * | Removed the --export_all_vtbl from linking.axis2010-05-032-6/+6
| * | Cleaned up the elf2e32 options a bit.axis2010-05-032-14/+31
* | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-05-031-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-0253-62/+52
|\ \ \ | |/ / |/| |
| * | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-301-10/+0
| * | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-3050-50/+50
| * | Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
* | | Fix desktopservices demo missing icon in SymbianMiikka Heikkinen2010-04-301-1/+5
* | | Make 'make sis' recursive again.Thomas Zander2010-04-291-1/+1
* | | Make symbian-resource files aware of libInfix configure featureThomas Zander2010-04-291-3/+3
|/ /
* | fix nmake build with win32-msvc2010Joerg Bornemann2010-04-262-2/+2
* | Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
* | 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