summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-10306-4443/+10713
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1057-222/+756
| |\
| | * Fixed tst_qpixmap::grabWidget autotest failure on QWS.Samuel Rødal2010-11-101-22/+32
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0958-201/+726
| | |\
| | | * Doc: Fixing typoSergio Ahumada2010-11-0910-15/+15
| | | * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | | * Doc: Fixing typoSergio Ahumada2010-11-0920-29/+29
| | | * Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0829-160/+683
| | | |\
| | | | * Fixed text rendering bug in raster engine when opacity != 1.0.Samuel Rødal2010-11-082-1/+28
| | | | * Prevented race condition on texture destruction.Samuel Rødal2010-11-084-12/+38
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0827-158/+628
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0627-158/+628
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0527-158/+628
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0527-158/+628
| | | | | | | |\
| | | | | | | | * More fix for QTBUG-14640:oci performance problem with qlonglongCharles Yin2010-11-053-29/+227
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0426-154/+426
| | | | | | | | |\
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0326-154/+426
| | | | | | | | | |\
| | | | | | | | | | * Doc: Fixing typoSergio Ahumada2010-11-031-3/+3
| | | | | | | | | | * Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-032-3/+4
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0324-151/+422
| | | | | | | | | | |\
| | | | | | | | | | | * Fix Malayalam Rendering - 'Ra' is PreBaseJiang Jiang2010-11-021-1/+1
| | | | | | | | | | | * Update .def files for QtGui and QtOpenVGEskil Abrahamsen Blomfeldt2010-11-022-0/+4
| | | | | | | | | | | * Use 32bit textures for alpha textures after all.Michael Dominic K2010-11-022-2/+21
| | | | | | | | | | | * One more fix for dithering.Michael Dominic K2010-11-021-8/+8
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0120-140/+388
| | | | | | | | | | | |\
| | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0120-140/+388
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Doc: Fixing typoSergio Ahumada2010-11-015-7/+7
| | | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0115-133/+381
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Fix QTBUG-14640:oci performance problem with qlonglongCharles Yin2010-11-012-1/+38
| | | | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-3015-132/+343
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2915-132/+343
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * 32bit => 16bit conversion has 4byte-aligned output.Michael Dominic K2010-10-291-4/+15
| | | | | | | | | | | | | | | | * Fix gcc bug in qReallocAlignedOlivier Goffart2010-10-291-8/+8
| | | | | | | | | | | | | | | | * Prevented threading related crash in OpenGL module.Samuel Rødal2010-10-293-24/+169
| | | | | | | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2910-96/+151
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-298-32/+88
| | | | | | | | | | | | | | | | | * Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errorsCharles Yin2010-10-292-64/+63
| * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-102-13/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Fix potential buffer overrun in ALSA QAudioInput implementation.Andrew den Exter2010-11-101-9/+12
| | * | | | | | | | | | | | | | | | | Fix potential buffer overrun in QAudioInput windows implementation.Andrew den Exter2010-11-101-4/+7
| * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-10246-4206/+9932
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Document that Transitions are exclusive.Michael Brasser2010-11-101-1/+5
| | * | | | | | | | | | | | | | | | | | Document TextInput::select(start,end)Michael Brasser2010-11-091-6/+17
| | * | | | | | | | | | | | | | | | | | docWarwick Allison2010-11-091-1/+1
| | * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-09243-4198/+9909
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix Text::elide docs.Bea Lam2010-11-091-1/+1
| | | * | | | | | | | | | | | | | | | | Fix Rectangle painting at small sizes.Martin Jones2010-11-091-1/+2
| | | * | | | | | | | | | | | | | | | | Fix QML ecmascript autotest.Yann Bodson2010-11-081-1/+2
| | | * | | | | | | | | | | | | | | | | Fix QtQuick import.Yann Bodson2010-11-081-1/+1