| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-11 | 104 | -3017/+3742 |
|\ |
|
| * | Comment out unused method. | Martin Jones | 2010-03-10 | 2 | -2/+3 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-10 | 70 | -597/+1253 |
| |\ |
|
| | * | Document - and use - the qmlRegisterXXX template functions | mae | 2010-03-10 | 7 | -113/+120 |
|
|
| | * | when loading debug import plugins on Mac, try with _debug.dylib suffix | mae | 2010-03-10 | 1 | -0/+3 |
|
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-10 | 64 | -484/+1130 |
| | |\ |
|
| | | * | fix inclusion of qt_targets.pri in qimportbase.pri | Joerg Bornemann | 2010-03-10 | 1 | -1/+1 |
|
|
| | | * | Use TARGETPATH instead of hardcoding locations | Tobias Hunger | 2010-03-10 | 2 | -2/+2 |
|
|
| | | * | Fix location in which webkit import is stored in builddir | Tobias Hunger | 2010-03-10 | 1 | -1/+1 |
|
|
| | | * | Merge remote branch 'qt/4.7' into qml-4.7 | Qt Continuous Integration System | 2010-03-10 | 71 | -2765/+3233 |
| | | |\ |
|
| * | | \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-10 | 15 | -85/+165 |
| |\ \ \ \ |
|
| | * | | | | Added clipping to the dashed stroke processor in the GL2 engine. | Kim Motoyoshi Kalland | 2010-03-10 | 4 | -30/+105 |
|
|
| | * | | | | Fixed assert failure when drawing dashes with raster engine. | Kim Motoyoshi Kalland | 2010-03-10 | 1 | -5/+6 |
|
|
| | * | | | | Update QGLFormat from EGLConfig properly | Tom Cooksey | 2010-03-10 | 6 | -45/+38 |
|
|
| | * | | | | Make calls to QGLFormat::set*BufferSize also update flags | Tom Cooksey | 2010-03-10 | 1 | -1/+5 |
|
|
| | * | | | | Compile fix when Qt3Support is enabled for devices using EGL. | Trond Kjernåsen | 2010-03-10 | 1 | -1/+1 |
|
|
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-10 | 371 | -7291/+18758 |
| | |\ \ \ \ |
|
| | | * | | | | Fixes Q3ListViewItem grandchildren not sorted if item has one child | Alexader Karaivanov | 2010-03-10 | 1 | -1/+8 |
|
|
| | | * | | | | Compile with Qt3Support in a ScratchBox environment. | Trond Kjernåsen | 2010-03-10 | 1 | -1/+1 |
| | | |/ / / |
|
| | * | | | | Cocoa: Fix misaligned text between format changes | Eskil Abrahamsen Blomfeldt | 2010-03-10 | 1 | -1/+1 |
|
|
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-10 | 2 | -0/+120 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | Update def files for latest QtDeclarative API | Shane Kearns | 2010-03-10 | 2 | -0/+120 |
|
|
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-10 | 9 | -50/+97 |
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used | Thierry Bastian | 2010-03-10 | 1 | -3/+0 |
|
|
| | * | | | | Make sure 16-bit EGL configs are chosen over 32-bit configs | Tom Cooksey | 2010-03-10 | 2 | -32/+55 |
|
|
| | * | | | | Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC | Tom Cooksey | 2010-03-10 | 1 | -3/+13 |
|
|
| | * | | | | Handle EGLSurfaces better, including more error detection | Tom Cooksey | 2010-03-10 | 6 | -10/+21 |
|
|
| | * | | | | Make sure pixmap hooks get installed so EGL surfaces are cleaned up | Tom Cooksey | 2010-03-10 | 1 | -0/+4 |
|
|
| | * | | | | Don't show resize cursor for fixed-size windows | Paul Olav Tvete | 2010-03-10 | 1 | -2/+4 |
|
|
| * | | | | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.... | Qt Continuous Integration System | 2010-03-10 | 72 | -2768/+3233 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | Don't wait forever when scanning for wifi networks on win32 fails. | Aaron McCarthy | 2010-03-10 | 1 | -3/+20 |
|
|
| | * | | | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.... | Qt Continuous Integration System | 2010-03-09 | 72 | -2765/+3213 |
| | |\ \ \ \ |
|
| | | * | | | | Revert 12b6987031be9faee3886d7623888feb4e1762af | Morten Johan Sørvig | 2010-03-09 | 1 | -7/+0 |
|
|
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-09 | 73 | -2765/+3220 |
| | | |\ \ \ \ |
|
| | | | * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-03-09 | 2 | -8/+33 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | Carbon: Native filedialog does not apply filters on app-bundles | Richard Moe Gustavsen | 2010-03-09 | 1 | -4/+13 |
|
|
| | | | | * | | | | Cocoa: Native filedialog does not apply filters on app-bundles | Richard Moe Gustavsen | 2010-03-09 | 1 | -3/+7 |
|
|
| | | | | * | | | | Improve performance of QTimer::singleShot | Markus Goetz | 2010-03-09 | 1 | -1/+13 |
|
|
| | | | * | | | | | doc: Fixed several qdoc errors. | Martin Smith | 2010-03-09 | 16 | -60/+53 |
| | | | |/ / / / |
|
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-09 | 61 | -2710/+3147 |
| | | | |\ \ \ \ |
|
| | | | | * | | | | use Qt's private mac functions, reduce code redundancy | Lorn Potter | 2010-03-09 | 1 | -43/+13 |
|
|
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-08 | 61 | -2676/+3143 |
| | | | | |\ \ \ \ |
|
| | | | | | * \ \ \ | Merge remote branch 'origin/4.7' into 4.7 | Thiago Macieira | 2010-03-08 | 13 | -473/+209 |
| | | | | | |\ \ \ \ |
|
| | | | | | * | | | | | Doc: mark QEasingCurve support functions as new in 4.7. | Volker Hilsheimer | 2010-03-08 | 1 | -0/+2 |
|
|
| | | | | | * | | | | | Autotest: Fix failing QTextCodec tests | Thiago Macieira | 2010-03-08 | 1 | -1/+1 |
|
|
| | | | | | * | | | | | Doc: mark methods as internal (as they were in previous releases) | Volker Hilsheimer | 2010-03-08 | 1 | -0/+10 |
|
|
| | | | | | * | | | | | Fixed mouse wheel handling in scrollareas. | Denis Dzyubenko | 2010-03-08 | 1 | -0/+1 |
|
|
| | | | | | * | | | | | Added two missing keys for X11 | Denis Dzyubenko | 2010-03-08 | 3 | -0/+7 |
|
|
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-08 | 55 | -2676/+3123 |
| | | | | | |\ \ \ \ \ |
|
| | | | | | | * | | | | | Carbon: usage of menu bars can cause exceptions to be thrown | Richard Moe Gustavsen | 2010-03-08 | 1 | -1/+1 |
|
|