Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change the ifdef for resolving function ptrs to match declaration | Tom Cooksey | 2010-04-06 | 1 | -1/+1 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-01 | 63 | -1296/+5270 |
|\ | |||||
| * | QScript: more missing APIShim | Olivier Goffart | 2010-04-01 | 1 | -0/+2 |
| * | Fix compilation warnings | Olivier Goffart | 2010-04-01 | 1 | -2/+2 |
| * | QScript: fix compilation warning | Olivier Goffart | 2010-04-01 | 1 | -1/+1 |
| * | QScript: fix APIShim usage. | Olivier Goffart | 2010-04-01 | 1 | -1/+1 |
| * | QtScript: remove duplicated APIshim in QScriptValueIterator | Olivier Goffart | 2010-04-01 | 1 | -6/+0 |
| * | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-04-01 | 45 | -276/+377 |
| |\ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-31 | 60 | -1287/+5266 |
| |\ \ | |||||
| | * \ | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7 | Olivier Goffart | 2010-03-31 | 16 | -74/+388 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | aavit | 2010-03-31 | 331 | -4852/+10351 |
| | |\ \ \ | |||||
| | | * | | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. | Alexis Menard | 2010-03-31 | 3 | -0/+39 |
| | | * | | | Micro optimization after feedback from Jan-Arve. | Alexis Menard | 2010-03-31 | 1 | -1/+1 |
| | | * | | | Show only one dialog when using QFileDialog on Mac. | Alexis Menard | 2010-03-31 | 1 | -0/+6 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 62 | -1219/+5135 |
| | | |\ \ \ | |||||
| | | | * | | | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 | Thiago Macieira | 2010-03-30 | 1 | -0/+2 |
| | | | * | | | Fix bad merge from 4.6. | Thiago Macieira | 2010-03-30 | 1 | -2/+4 |
| | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 2110 | -89046/+301191 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-30 | 150 | -2746/+5190 |
| | | | | |\ \ \ | |||||
| | | | | * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 2 | -1/+5 |
| | | | | |\ \ \ \ | |||||
| | | | | | * | | | | Hack .pro files on windows to define QT_NO_EGL | Tom Cooksey | 2010-03-30 | 1 | -0/+1 |
| | | | | | * | | | | Fix QDate::isLeapYear() for years < 1 | John Layt | 2010-03-30 | 1 | -1/+4 |
| | | | | * | | | | | Support the pen set on the painter in QStaticText when using rich text | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -0/+5 |
| | | | | * | | | | | Fix setting font for QStaticText on Linux and Mac | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -5/+5 |
| | | | | |/ / / / | |||||
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 54 | -1212/+5099 |
| | | | | |\ \ \ \ | |||||
| | | | | | * | | | | QScript: More missing APIShim | Olivier Goffart | 2010-03-29 | 1 | -0/+4 |
| | | | | | * | | | | QScriptEngine: Fix reentrency involving creation and desctructions of QScript... | Olivier Goffart | 2010-03-29 | 3 | -24/+80 |
| | | | | | * | | | | Work-around Symbian 10.1's broken egl.h | Tom Cooksey | 2010-03-29 | 2 | -4/+9 |
| | | | | | * | | | | Add some #warnings to debug Symbian EGL build failure | Tom Cooksey | 2010-03-29 | 1 | -0/+24 |
| | | | | | * | | | | Don't detect EGLImage presence by testing function pointers | Tom Cooksey | 2010-03-29 | 1 | -2/+2 |
| | | | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 21 | -94/+342 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | QVarLenghtArray: add some API to be consistant to QVector | Olivier Goffart | 2010-03-29 | 2 | -1/+50 |
| | | | | | | * | | | | Don't try to resolve EGLImage function pointers if they are defined | Tom Cooksey | 2010-03-29 | 1 | -0/+2 |
| | | | | | * | | | | | Implement proper QStaticText support in QPaintBuffer | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 2 | -14/+29 |
| | | | | | * | | | | | Make QStaticText layout lazy | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 4 | -29/+45 |
| | | | | | * | | | | | Change QStaticText::setMaximumSize() to setTextWidth() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 5 | -70/+77 |
| | | | | | * | | | | | Respect QPainter::pen() in QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 2 | -4/+13 |
| | * | | | | | | | | | Total makeover of SVG image reader | aavit | 2010-03-31 | 2 | -67/+106 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Change ORs to ANDs when checking EGLImage extension defines | Tom Cooksey | 2010-03-29 | 2 | -4/+4 |
| | * | | | | | | | | Protect EGLImage function definitions in #ifdef | Tom Cooksey | 2010-03-29 | 1 | -0/+2 |
| | * | | | | | | | | Fix a bug in greek shaping causing infinite loops | Lars Knoll | 2010-03-26 | 2 | -13/+54 |
| | * | | | | | | | | improve mingw 64 bit support | Thierry Bastian | 2010-03-26 | 1 | -1/+1 |
| | * | | | | | | | | Fix build on Windows | Tom Cooksey | 2010-03-26 | 1 | -0/+1 |
| | * | | | | | | | | Round instead of ceil font metrics when ForceIntegerMetrics is enabled | Tor Arne Vestbø | 2010-03-26 | 1 | -24/+24 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-26 | 41 | -1063/+4719 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Remove EGLImage create/destroy resolving from VG pixmap data | Tom Cooksey | 2010-03-26 | 1 | -6/+1 |
| | | * | | | | | | | | Avoid having to create temporary QPixmaps when binding to texture | Tom Cooksey | 2010-03-26 | 4 | -13/+10 |
| | | * | | | | | | | | Implement Texture-From-Pixmap using EGLImage extensions on X11/EGL | Tom Cooksey | 2010-03-26 | 6 | -37/+190 |
| | | * | | | | | | | | QMetaObject::normalizeType: Fix parsing of type which contains "const" in names | Olivier Goffart | 2010-03-26 | 1 | -1/+2 |
| | | * | | | | | | | | QMetaObject::normalizeType: fix uses of const and template. | Olivier Goffart | 2010-03-26 | 1 | -1/+3 |
| | | | |_|_|/ / / / | | | |/| | | | | | |