summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-182-12/+6
|\
| * Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-181-0/+5
| * Remove unnecessary lines from MMP files when using libstdcppv5.dllIain2009-09-161-12/+1
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151-0/+6
|\ \ | |/
| * Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-101-0/+6
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-041-1/+1
|\ \ | |/
| * Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-1/+1
| |\
| | * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-1/+1
* | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-031-6/+6
|\ \ \ | |/ /
| * | Fixed Qt/S60 build failures when MOC_DIR contains a `.' anywhere.Rohan McGovern2009-09-031-6/+6
| |/
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-2517-8/+740
|\ \ | |/
| * 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
| | |\ \ | | | |/
| * | | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-192-3/+2
| |/ /
| * | Merge commit 'qt/master'Jason Barron2009-08-186-6/+20
| |\ \
| * \ \ Merge commit 'qt/master'Jason Barron2009-08-101-1/+1
| |\ \ \
| * \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-061-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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-274-8/+16
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-252-87/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Remove extra bracket on stlportv5 detection.Jason Barron2009-06-161-1/+1
| * | | | | | | | | | | Fix detection of stlportv5.Jason Barron2009-06-161-2/+4
| * | | | | | | | | | | More robust handling for stdapis pathsMiikka Heikkinen2009-06-122-16/+28
| * | | | | | | | | | | Make Qt exception safer.Robert Griebl2009-06-102-7/+35
| * | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-6/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | IBY files for adding Qt into ROMIain2009-05-081-2/+42
| * | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-273-22/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Long live Qt for S60!axis2009-04-2489-0/+1992
| / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-196-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | mingw: make it possible to build without rtti supportThierry Bastian2009-08-181-0/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| |/ / / / / / / / / / / /