summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-07-233-7/+15
|\
| * 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-101-1/+1
|\ \ \ | |/ /
| * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-023-2/+12
|\ \ \ | |/ /
| * | Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+2
| |\ \ | | |/
| | * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| * | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-242-0/+10
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-244-1/+11
|\ \ \ | |/ /
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-224-1/+11
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-191-1/+1
|\ \ \ | |/ /
| * | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-092-6/+10
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-6/+10
| |\ \ | | |/
| | * Ensure that the manifest files are placed correctlyAndy Shaw2009-06-082-6/+10
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-271-2/+1
|\ \ \ | |/ /
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Warwick Allison2009-05-151-0/+5
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-05-141-0/+5
| |\ \ | | |/
| | * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+5
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-222-5/+12
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-04-201-4/+6
| |\ \ | | |/
| | * do not add UI_DIR to INCLUDEPATH if no FORMS are usedOswald Buddenhagen2009-04-201-4/+6
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+6
| |\ \ | | |/
| | * fix compilation of QtWebKit with Visual StudioJoerg Bornemann2009-04-201-1/+6
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-1/+3
|/ /
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-23/+40
|\ \ | |/
| * Fixes WebKit still occasionally failing to compile with MinGW whenRohan McGovern2009-04-151-9/+10
| * Fixes compile of WebKit with MinGW when using any `-j' option to buildRohan McGovern2009-04-131-23/+39
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-073-0/+15
|\ \ | |/
| * make shadow builds with default moc/ui dirs work againOswald Buddenhagen2009-04-073-0/+15
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-022-2/+2
|\ \ | |/
| * some more quoting for qmake ...Oswald Buddenhagen2009-04-022-2/+2
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-2/+8
|\ \ | |/
| * re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+0
|\ \ | |/
| * Revert "don't include uic in non-gui configurations"Rohan McGovern2009-03-301-3/+0
* | Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
|\ \ | |/
| * Revert "make shadow builds work even if a non-shadow build is present"Bradley T. Hughes2009-03-272-2/+2
| * don't include uic in non-gui configurationsOswald Buddenhagen2009-03-271-0/+3
| * make shadow builds work even if a non-shadow build is presentOswald Buddenhagen2009-03-272-2/+2
| * Long live Qt 4.5!Lars Knoll2009-03-2379-0/+1344
* Long live Qt!Lars Knoll2009-03-2379-0/+1271