summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-01100-1387/+6672
|\
| * Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does n...Olivier Goffart2010-04-011-0/+4
| * QScript: more missing APIShimOlivier Goffart2010-04-011-0/+2
| * Fix compilation warningsOlivier Goffart2010-04-011-2/+2
| * QScript: fix compilation warningOlivier Goffart2010-04-011-1/+1
| * QScript: fix APIShim usage.Olivier Goffart2010-04-011-1/+1
| * QtScript: remove duplicated APIshim in QScriptValueIteratorOlivier Goffart2010-04-011-6/+0
| * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0180-950/+1009
| |\
| * | Attempt to fix the test.Alexis Menard2010-03-311-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3197-1378/+6664
| |\ \
| | * \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-3121-130/+405
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-311182-6051/+13584
| | |\ \ \
| | | * | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-314-0/+110
| | | * | | Micro optimization after feedback from Jan-Arve.Alexis Menard2010-03-311-1/+1
| | | * | | Show only one dialog when using QFileDialog on Mac.Alexis Menard2010-03-311-0/+6
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3094-1308/+5916
| | | |\ \ \
| | | | * | | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7Thiago Macieira2010-03-301-0/+2
| | | | * | | Fix bad merge from 4.6.Thiago Macieira2010-03-302-94/+27
| | | | * | | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-305614-159991/+643998
| | | | |\ \ \
| | | | | * \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-30184-2938/+5576
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-306-5/+16
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-307-9/+91
| | | | | | |\ \ \ \
| | | | | | | * | | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-304-0/+6
| | | | | | * | | | | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| | | | | | * | | | | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| | | | | * | | | | | Fix QStaticText test on MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Fix QDate::isLeapYear() for years < 1John Layt2010-03-302-9/+46
| | | | | * | | | | One more test for chinese codecsOlivier Goffart2010-03-301-0/+39
| | | | | |/ / / /
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3076-1273/+5686
| | | | | |\ \ \ \
| | | | | | * | | | QScript: More missing APIShimOlivier Goffart2010-03-291-0/+4
| | | | | | * | | | QScriptEngine: Fix reentrency involving creation and desctructions of QScript...Olivier Goffart2010-03-294-24/+101
| | | | | | * | | | Work-around Symbian 10.1's broken egl.hTom Cooksey2010-03-292-4/+9
| | | | | | * | | | Add some #warnings to debug Symbian EGL build failureTom Cooksey2010-03-291-0/+24
| | | | | | * | | | Don't detect EGLImage presence by testing function pointersTom Cooksey2010-03-291-2/+2
| | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2931-101/+457
| | | | | | |\ \ \ \
| | | | | | | * | | | QVarLenghtArray: add some API to be consistant to QVectorOlivier Goffart2010-03-293-1/+63
| | | | | | | * | | | Don't try to resolve EGLImage function pointers if they are definedTom Cooksey2010-03-291-0/+2
| | | | | | * | | | | Implement proper QStaticText support in QPaintBufferEskil Abrahamsen Blomfeldt2010-03-292-14/+29
| | | | | | * | | | | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-295-30/+46
| | | | | | * | | | | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-296-89/+109
| | | | | | * | | | | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-293-4/+103
| | * | | | | | | | | Total makeover of SVG image readeraavit2010-03-319-69/+667
| | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Change ORs to ANDs when checking EGLImage extension definesTom Cooksey2010-03-292-4/+4
| | * | | | | | | | Protect EGLImage function definitions in #ifdefTom Cooksey2010-03-291-0/+2
| | * | | | | | | | Fix a bug in greek shaping causing infinite loopsLars Knoll2010-03-263-13/+90
| | * | | | | | | | Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | * | | | | | | | improve mingw 64 bit supportThierry Bastian2010-03-261-1/+1
| | * | | | | | | | Fix build on WindowsTom Cooksey2010-03-261-0/+1
| | * | | | | | | | Round instead of ceil font metrics when ForceIntegerMetrics is enabledTor Arne Vestbø2010-03-261-24/+24