summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* docWarwick Allison2010-05-0519-205/+210
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0530-316/+500
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-051-1/+9
| |\
| | * Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-051-1/+9
| * | Null objects should appear as JS nullAaron Kennedy2010-05-051-1/+2
| |/
| * Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-0482-1667/+2609
| |\
| | * Optimization for QDeclarativePaintedItem.Michael Brasser2010-05-042-12/+20
| | * Update childrenRect when children are added or removed.Michael Brasser2010-05-042-3/+40
| | * Optimize childrenRect.Michael Brasser2010-05-042-43/+87
| | * Remove obsolete doc groupings.Michael Brasser2010-05-0415-69/+1
| | * Doc improvementsBea Lam2010-05-041-22/+28
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | |\ \
| | | * | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | | |\ \
| | | | * | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | | | | | syntax updateWarwick Allison2010-05-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-04216-2288/+5620
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-036-63/+78
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0330-145/+194
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-034-61/+76
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-032-2/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| | | * | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| * | | | | Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| | |_|/ / | |/| | |
| * | | | Fixed OpenGL version flags for versions > 3.2.Kim Motoyoshi Kalland2010-05-031-1/+14
| * | | | Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and Q...Jan-Arve Sæther2010-05-039-102/+16
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0235-99/+206
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0236-102/+209
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0136-102/+209
| | | |\ \
| | | | * | Fix wrong translation and clip for the raster paint-engine on MacTor Arne Vestbø2010-04-301-5/+3
| | | | * | Return the correct library name in qt_gl_library_name for GLES*Tom Cooksey2010-04-301-4/+10
| | | | * | Fix QT_NO_LIBRARYTasuku Suzuki2010-04-2915-50/+48
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-04-2919-33/+265
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2810-24/+43
| | | | | |\ \
| | | | | | * | Fix crash in styles example when running with opengl graphicssystemTom Cooksey2010-04-281-8/+8
| | | | | | * | Fixed the sizehint for cols/rows in qtableviewThierry Bastian2010-04-281-4/+4
| | | | | | * | QUrl: parsing of host name with an undercore.Olivier Goffart2010-04-281-1/+3
| | | | | | * | Null pointer checkPaul Olav Tvete2010-04-281-1/+1
| | | | | | * | Revert "Try to use multisampled opengl graphicssystem on all platforms"Eskil Abrahamsen Blomfeldt2010-04-281-1/+0
| | | | * | | | Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.Jan-Arve Sæther2010-04-291-3/+3
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-04-284513-184148/+355991
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | A small mistake when comparing the flag.Alexis Menard2010-04-281-1/+3
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-274-8/+24
| | | | | |\ \ \
| | | | | | * | | Fix crash when CoreText fails to shape text for usTor Arne Vestbø2010-04-271-2/+13
| | | | | | * | | Fix crash when using opengl graphicssystem on desktopTom Cooksey2010-04-273-6/+11
| | | | * | | | | Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedL...Jan-Arve Sæther2010-04-139-16/+102
| * | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0212-64/+63
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0212-64/+63
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |