summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-0833-981/+236
|\
| * mkspec wince60standard-x86-msvc2005 addedJoerg Bornemann2009-09-083-73/+76
| * use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-0830-908/+160
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-042-3/+3
|\ \ | |/
| * Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-032-3/+3
| |\
| | * Move the S60/Avkon framework initialization into QtGui.axis2009-09-032-3/+3
* | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-033-72/+8
|\ \ \ | |/ /
| * | Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-031-2/+2
| * | Fixed Qt/S60 build failures when MOC_DIR contains a `.' anywhere.Rohan McGovern2009-09-031-6/+6
| * | Removed stale fixed_stdlib.h file.Janne Anttila2009-09-021-64/+0
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-31118-1534/+1534
|\ \ \ | |/ /
| * | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3114-182/+182
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-31104-1352/+1352
| |\ \
| | * | Update tech preview license header.Jason McDonald2009-08-31104-1352/+1352
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-316-0/+207
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into 4.6Janne Anttila2009-08-282-0/+43
| |\ \ \
| | * | | Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-281-2/+6
| | * | | Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+2
| | * | | Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-272-0/+39
| * | | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-281-0/+41
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add missing license headers.Jason McDonald2009-08-284-0/+164
| | * | | Update license headers.Jason McDonald2009-08-11100-100/+100
| | * | | Fix compilation of webkit with mingwThierry Bastian2009-08-031-3/+0
| * | | | Fix some missing and duplicated license headers.Jason McDonald2009-08-273-0/+123
| | |_|/ | |/| |
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-2530-8/+1580
|\ \ \ \ | |/ / /
| * | | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-1/+1
| | |/ | |/|
| * | Merge commit 'origin/master' into symbolVisibilityIain2009-08-212-7/+6
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-5/+4
| | |\ \
| | | * | Updated flawed comment after 5365c1cdJanne Anttila2009-08-211-5/+4
| | * | | Merge commit 'qt/master'Jason Barron2009-08-211-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | make Qt Designer compile when Qt is configured with -no-scriptKent Hansen2009-08-191-1/+2
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-214-8/+12
| | |\ \ \
| | * | | | Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"Janne Anttila2009-08-211-1/+0
| * | | | | Merge commit 'origin/master' into symbolVisibilityIain2009-08-209-14/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Changed a define to comply to Qt naming conventions.Miikka Heikkinen2009-08-201-4/+4
| | * | | | Comment clarifications based on mkspecs review.Miikka Heikkinen2009-08-203-4/+8
| | |/ / /
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-194-3/+4
| | |\ \ \
| | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+1
| | | |\ \ \ | | | | |/ /
| | | * | | Changed names and URLs to reflect name change.axis2009-08-193-3/+3
| | * | | | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-192-3/+2
| | |/ / /
| * | | | Update schema version number for SBSv2 Qt integrationIain2009-08-191-1/+1
| * | | | Ensure the correct set of symbols are exported in the DEF files (part 1)Iain2009-08-191-1/+2
| |/ / /
| * | | Merge commit 'qt/master'Jason Barron2009-08-186-6/+20
| |\ \ \
| * \ \ \ Merge commit 'qt/master'Jason Barron2009-08-13115-109/+204
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt/master'Jason Barron2009-08-101-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-103-3/+188
| |\ \ \ \ \ \
| * | | | | | | Enable symbol visibility when compiling with RVCT.axis2009-08-061-1/+1
| * | | | | | | Update license headers according to commit 858c70f768e.axis2009-08-068-13/+13
| * | | | | | | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-2/+2
| * | | | | | | Fix extern WebKit build that uses qmake generators.Simon Hausmann2009-08-061-1/+1