summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Alexis Menard2009-05-123-10/+9
|\
| * Merge branch '4.5'Thiago Macieira2009-05-113-9/+8
| |\
| | * macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-083-14/+9
| | * Make the g++-42 mkspec use gcc-4.2 for linking as well.Morten Sørvig2009-05-081-2/+6
| * | Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-081-1/+1
* | | 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-226-2/+223
|/ /
* | 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-23321-0/+18817
* Long live Qt!Lars Knoll2009-03-23321-0/+18744