summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extended the convenience functions for QInputDialog for IM hints.axis2010-10-082-5/+52
* Merge branch '4.7-s60' into master-s60axis2010-10-088-21/+55
|\
| * Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-084-2/+38
| * Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| * Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| * Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-08206-403/+405
* | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-086-17/+23
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-088-58/+90
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-088-58/+90
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-58/+90
| | |\
| | | * Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-072-1/+42
| | | * Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
| | |\ \
| | | * \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-071-0/+1
| | | | |\ \
| | | | | * | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-0823-426/+637
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0823-426/+637
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0724-427/+638
| |\ \ \ \ \
| | * | | | | Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| | * | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| | * | | | | Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| | * | | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0727-2817/+1632
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | ActiveQt: also make the designer plugin for qaxwidget build in the opensource...Patrick Spendrin2010-10-071-1/+1
| | | * | | | Fix compilationOlivier Goffart2010-10-074-8/+9
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Benjamin Poulain2010-10-063-19/+135
| | | |\ \ \ \
| | | | * | | | Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
| | | | * | | | QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-062-18/+134
| | | * | | | | Code cleaning with the merge request 2286Benjamin Poulain2010-10-065-17/+15
| | | * | | | | Fix a pending issue with the merge request 2286Benjamin Poulain2010-10-061-6/+1
| | | * | | | | Fixed the build error in qtconfigBoris Moiseev2010-10-061-1/+1
| | | * | | | | Resolved a little code style issue in qtconfigBoris Moiseev2010-10-061-1/+3
| | | * | | | | Renamed controls in qtconfig's MainWindowBoris Moiseev2010-10-062-346/+357
| | | * | | | | Removed inheritance from UI file in qtconfig's MainWindowBoris2010-10-062-245/+269
| | | * | | | | Fixed a bug and resolved some translation issues in qtconfigBoris Moiseev2010-10-061-8/+8
| | | * | | | | Fixed some problems in qtconfig's PreviewWidgetBoris Moiseev2010-10-063-33/+28
| | | * | | | | Removed the inheritance from ui file in qtconfig's PaletteEditorAdvancedBoris Moiseev2010-10-062-38/+45
| | | * | | | | Replaced the unnecessary include with declarationBoris Moiseev2010-10-062-2/+2
| | | * | | | | Resolved some code style issues and fixed the broken copyright yearBoris Moiseev2010-10-065-39/+40
| | | * | | | | Finally removed the qtconfig dependency from qt3supportBoris Moiseev2010-10-062-2/+1
| | | * | | | | Modified previewwidget's ui file in qtconfigBoris Moiseev2010-10-061-7/+7
| | | * | | | | Fixed some code style issues in qtconfigBoris Moiseev2010-10-061-26/+3
| | | * | | | | Refactored the MainWindow in qtconfigBoris Moiseev2010-10-067-696/+235
| | | * | | | | Refactored PaletteEditorAdvanced in qtconfigBoris Moiseev2010-10-068-1244/+623
| | | * | | | | Removed more legacy code from qtconfig and fixed codestyle issuesBoris Moiseev2010-10-064-18/+17
| | | * | | | | Refactored PreviewWidget in qtconfigBoris Moiseev2010-10-068-513/+285
| | | |/ / / /