summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-25/+44
|\
| * fix qmake -project modeOswald Buddenhagen2010-03-031-0/+11
| * deprecate -win32/-unix/-macx which set both host and target modeOswald Buddenhagen2010-02-261-3/+3
| * decouple host platform mode from target platform modeOswald Buddenhagen2010-02-261-8/+12
| * factor out applyHostMode()Oswald Buddenhagen2010-02-261-9/+13
| * use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-261-1/+1
| * add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-261-5/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-181-6/+1
|\ \ | |/
| * remove remainder of mac9 modeOswald Buddenhagen2010-02-121-6/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-11/+25
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-2/+2
| |\
| * \ Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
| |\ \
| * | | Patched qmake to try to resolve a directory argument in makefile mode.J-P Nurmi2009-10-061-11/+25
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | qmake: fix warningsOswald Buddenhagen2010-02-011-2/+2
| | |/ | |/|
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-211-1/+1
|\ \ \ | |/ /
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/
* | Fix symbian builds on Linux.Simon Hausmann2009-10-231-0/+1
|/
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-101-0/+3
|\ \ \ | |/ /
| * | Add hints that a qmake generated .pro will need to be editedKeith Isdale2009-08-061-0/+3
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-061-12/+3
|\ \ \ | |/ /
| * | Port of Qt to QNXHarald Fernengel2009-07-291-2/+0
| * | qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-011-10/+3
| |/
* | Further cleanup of qmake codesMiikka Heikkinen2009-08-061-0/+2
|/
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+776