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-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
| * | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-065-9/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/master'Jason Barron2009-08-043-6/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-3/+3
| | * | | | | | | | Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+2
| | * | | | | | | | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-292-2/+4
| * | | | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-0417-0/+1265
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-275-9/+17
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fixed compile of Qt/symbian projects which set a custom MOC_DIRRohan McGovern2009-07-232-5/+5
| * | | | | | | | | | Make S60 integration optional.Jason Barron2009-07-151-4/+2
| * | | | | | | | | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-2/+39
| |\ \ \ \ \ \ \ \ \ \