summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Safeguard the colortable access when converting corrupted indexed8Gunnar Sletta2010-03-261-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-26309-14542/+14361
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-556/+555
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-556/+555
| | |\
| | | * Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25284-13975/+13795
| | | |\
| | | * | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| | | * | Fix warnings and build on mingwThierry Bastian2010-03-258-497/+164
| | | * | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
| | | * | cetest build fixJoerg Bornemann2010-03-252-1/+4
| | | * | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
| | | * | Fixed QPrintPreview text drawing (visible in Assistant).Trond Kjernåsen2010-03-251-2/+7
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-25234-3459/+2754
| | | |\ \
| | | | * | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-253-7/+209
| | | * | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-268-38/+95
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | * | | | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | * | | | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-263-7/+29
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | * | | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | * | | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | * | | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | * | | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-25226-3447/+2531
| | |\ \ \
| | | * \ \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | * | | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ / /
| | * | | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | * | | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | * | | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2520-24/+67
| | * | | Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | * | | Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | * | | fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | * | | not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-24146-1017/+4133
| | |\ \ \
| | | * | | Update changelogThiago Macieira2010-03-241-0/+10
| | | * | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\ \ \
| | | * | | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | * | | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2416-213/+435
| | | |\ \ \ \
| | | | * | | | Do not move keyboard focus to invisible windows on X11.Denis Dzyubenko2010-03-242-6/+2
| | | | * | | | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-242-2/+3
| | | | * | | | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25
| | | | * | | | Give 1-pixel splitters a larger grab areaJens Bache-Wiig2010-03-242-1/+32
| | | | * | | | Redesigned object and class labels for the Designer propertyeditorJens Bache-Wiig2010-03-242-12/+60
| | | | * | | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | | * | | | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-244-1/+91