summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-1/+11
|\
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-231-0/+5
| * Factored readRegistryKey implementation out of qmakeaxis2010-02-231-0/+7
| * Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-211-7/+0
| * Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-211-5/+0
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-0/+12
| |\
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-191-0/+5
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-191-0/+7
| | * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-191-7/+0
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-191-5/+0
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-181-0/+5
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-181-0/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-181-5/+1
|\ \ \ | |/ /
| * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-121-5/+1
| |/
* | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-2/+6
|/
* Merge commit 'qt/master'Jason Barron2009-08-211-194/+3
|\
| * remove QtScript from includepathKent Hansen2009-08-191-1/+0
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-181-4/+4
| |\
| * \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-281-2/+9
| |\ \
| * | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-161-192/+2
* | | | Merge commit 'qt/master'Jason Barron2009-08-181-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | CompileAnders Bakken2009-08-171-4/+4
| | |/ | |/|
* | | Merge commit 'origin/master'Jason Barron2009-08-041-9/+10
|\ \ \
| * | | Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-041-9/+10
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-2/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Compile fix on windows.Denis Dzyubenko2009-07-161-2/+2
| * | Changed the implementation of the unicode text codecs to share more code with...Denis Dzyubenko2009-07-161-0/+7
| |/
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-081-1/+1
|\ \ | |/
| * link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+591
* Fixed a few typos in qmake makefile for win32.axis2009-04-271-1/+2
* Long live Qt for S60!axis2009-04-241-0/+619