summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-1/+1
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-1/+1
* | Fixed Qt/S60 build failures when MOC_DIR contains a `.' anywhere.Rohan McGovern2009-09-031-6/+6
|/
* Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-1/+1
* 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-212-3/+7
|\ \
| * | Comment clarifications based on mkspecs review.Miikka Heikkinen2009-08-202-3/+7
* | | Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"Janne Anttila2009-08-211-1/+0
|/ /
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-191-0/+1
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+1
| |\ \ | | |/
| | * mingw: make it possible to build without rtti supportThierry Bastian2009-08-181-0/+1
* | | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-192-3/+2
|/ /
* | Merge commit 'qt/master'Jason Barron2009-08-186-6/+20
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Sorvig2009-08-174-4/+4
| |\
| | * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-174-4/+4
| * | Fix compiler flags setting for .mm files on Mac.Morten Sorvig2009-08-171-2/+1
| |/
| * Remove yet another forgotten debug message.Morten Sorvig2009-08-131-1/+0
| * Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-08-131-0/+16
* | Merge commit 'qt/master'Jason Barron2009-08-101-1/+1
|\ \ | |/
| * In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-1/+1
* | Merge commit 'qt/master-stable'Jason Barron2009-08-061-1/+2
|\ \ | |/
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-1/+2
* | Merge commit 'origin/master'Jason Barron2009-08-041-1/+2
|\ \
| * | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-1/+2
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-0/+63
|\ \ \ | | |/ | |/|
| * | Port of Qt to VxWorksRobert Griebl2009-07-291-0/+63
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-274-8/+16
|\ \ \ | |/ / | | / | |/ |/|
| * Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+2
| |\
| | * fix qmake syntaxOswald Buddenhagen2009-07-201-2/+2
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+6
| |\ \ | | |/
| | * Revert 6b9328 and fix the original dependency problem againAndy Shaw2009-07-151-0/+6
| | * Don't cause a rebuild of the application when mocinclude.tmp is usedAndy Shaw2009-07-151-2/+0
| * | Make openvg.prf work properlyRhys Weatherley2009-07-192-2/+9
| * | Fix compilation of webkit with mingwThierry Bastian2009-07-151-3/+0
| * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| * | Merge branch '4.5'Marius Storm-Olsen2009-06-301-2/+2
| |\ \ | | |/
* | | Fixed compile of Qt/symbian projects which set a custom MOC_DIRRohan McGovern2009-07-232-5/+5
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-092-2/+12
|\ \ \
| * | | Fixed qmake "not found" error.axis2009-07-071-0/+10
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-071-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291-1/+1
| |\ \ \ | | |/ /
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-304-1/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-242-0/+10
| * | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-224-1/+11
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-252-87/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+1
| |\ \ | | |/