summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-275-9/+17
|\
| * Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+2
| |\
| | * fix qmake syntaxOswald Buddenhagen2009-07-201-2/+2
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+6
| |\ \ | | |/
| | * Revert 6b9328 and fix the original dependency problem againAndy Shaw2009-07-151-0/+6
| | * Don't cause a rebuild of the application when mocinclude.tmp is usedAndy Shaw2009-07-151-2/+0
| * | Make openvg.prf work properlyRhys Weatherley2009-07-192-2/+9
| * | Fix compilation of webkit with mingwThierry Bastian2009-07-151-3/+0
| * | Build fix for mingwThierry Bastian2009-07-141-1/+1
| * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| * | Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+2
| |\ \ | | |/
* | | Fixed compile of Qt/symbian projects which set a custom MOC_DIRRohan McGovern2009-07-232-5/+5
* | | Make S60 integration optional.Jason Barron2009-07-151-4/+2
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-2/+39
|\ \ \
| * | | Fixed qmake "not found" error.axis2009-07-071-0/+0
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-071-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| * | | Merge branch 'warningRemovals'axis2009-07-061-0/+10
| |\ \ \
| | * | | Started suppressing some rather pointless warnings from RVCT.axis2009-07-061-0/+10
| * | | | Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-012-0/+27
| |/ / /
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29103-205/+203
| |\ \ \ | | |/ /
* | | | Move the EGL library to a different qmake variable.Jason Barron2009-07-081-1/+2
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30107-205/+229
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.5'Thiago Macieira2009-06-242-4/+2
| |\ \ \ | | | |/ | | |/|
| | * | Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-232-4/+2
| * | | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-243-0/+13
| * | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-225-1/+14
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16100-200/+200
| |\ \ \ | | |/ /
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16100-200/+200
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-254-89/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+1
| |\ \ | | |/
| | * keep CONFIG+=silent working with the new translations.pro fileBradley T. Hughes2009-06-121-1/+1
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-6/+10
| |\ \ | | |/
| * | Merge branch '4.5'Tom Cooksey2009-05-281-2/+5
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-226-81/+19
| |\ \ \
| | * \ \ Merge branch '4.5'Thiago Macieira2009-05-144-5/+16
| | |\ \ \
| | * \ \ \ Merge branch '4.5'Thiago Macieira2009-05-113-9/+8
| | |\ \ \ \
| | * | | | | Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-081-1/+1
| | * | | | | Merge branch '4.5'Thiago Macieira2009-04-201-4/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+6
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-04-151-23/+40
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-073-0/+15
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-022-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-2/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Long live Qt!Lars Knoll2009-03-23321-0/+18744
| | / / / / / / / / / / / /
| * | | | | | | | | | | | | kill experimental QtAnimation module stuff, the module doesn't exist anymoreKent Hansen2009-05-201-2/+1
| * | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-126-31/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-17321-0/+18818
| / / / / / / / / / / / /