summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Improvements to the QGLShaderProgram APIRhys Weatherley2010-02-042-0/+196
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-0416-345/+158
|\
| * Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-0416-345/+158
* | Qt applications not responding to WM_GETHOTKEY on windows.Prasanth Ullattil2010-02-032-0/+17
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-031-4/+6
|\ \ | |/ |/|
| * QDir fix issues with (shared) cached listsJoão Abecasis2010-02-031-4/+6
* | QFileDialog: Compilation fix on windowsThierry Bastian2010-02-032-23/+17
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Rhys Weatherley2010-02-0228-118/+485
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-023-6/+106
| |\
| | * QSortFilterProxyModel: Fix dynamic sorting when severals rows are added.Olivier Goffart2010-02-021-6/+10
| | * QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.David Faure2010-02-022-0/+96
| * | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-0220-75/+371
| |\ \
| | * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-027-19/+641
| | |\ \
| | * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0220-75/+371
| | |\ \ \
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
| | | * | | Fix a problem with overlay icons in the fileiconproviderJens Bache-Wiig2010-02-011-2/+3
| | | * | | Only set the _WIN32_WINNT define if it is not set or less than 0x0400Andy Shaw2010-02-011-0/+2
| | | * | | QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| | | * | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | * | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-023-8/+7
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge commit 'origin/master'Richard Moe Gustavsen2010-02-029-34/+641
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Use RefPtr to store QScriptProgram's EvalExecutableKent Hansen2010-02-012-6/+7
| | * | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0189-977/+2143
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Revert "add QModelIndex::rowCount() and QModelIndex::ColumnCount convenience ...Olivier Goffart2010-02-022-29/+1
| | |_|/ / | |/| | |
* | | | | Add Q_MOVABLE_TYPE decls to QVector?D, QMatrix4x4, QQuaternionRhys Weatherley2010-02-025-0/+10
|/ / / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-017-19/+641
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-017-19/+641
| |\ \ \ | | |/ / | |/| |
| | * | Placate pedantic compiler warning modes on QGLBufferRhys Weatherley2010-02-012-15/+15
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Rhys Weatherley2010-02-0121-237/+348
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-015-15/+621
| | | |\ \
| | * | | | Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-012-4/+20
| | | |/ / | | |/| |
| | * | | Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-015-15/+621
* | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0190-992/+2145
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2813-31/+29
| |\ \ \
| | * | | Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | * | | Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | * | | Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-283-4/+4
| | * | | Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-283-3/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2865-465/+1572
| | |\ \ \
| | | * | | Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| | | * | | Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
| | * | | | Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-281-0/+4
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2832-186/+333
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-285-8/+31
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1Prasanth Ullattil2010-01-285-8/+31
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | * | | | | | doc: Fixed the last qdoc errors.Martin Smith2010-01-282-8/+13
| | |/ / / / /
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2833-546/+807
| | |\ \ \ \ \