summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0211-14/+189
|\
| * Fixed maketestselftest failure with some MSVC versions.Rohan McGovern2010-02-021-0/+3
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
| * Fix a problem with overlay icons in the fileiconproviderJens Bache-Wiig2010-02-011-2/+3
| * Only set the _WIN32_WINNT define if it is not set or less than 0x0400Andy Shaw2010-02-011-0/+2
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0117-63/+191
|\
| * QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| * Fix autotest memory leakKent Hansen2010-01-291-1/+1
| * Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| * Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-011-10/+10
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-291-10/+10
| |\ \ | | |/ | |/|
| | * Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-02-014-1/+122
|\ \ \ | |/ / |/| |
| * | audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-293-0/+118
| |\ \ |/ / /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-293-0/+118
| |\ \
| | * | Add QFontMetrics benchmark.Michael Brasser2010-01-293-0/+118
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2924-46/+46
|\ \ \ \
| * | | | Fixed `make test' for xmlpatternsxqts.Rohan McGovern2010-01-291-1/+0
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2823-45/+46
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Doc: Put the correct images with the D-Bus and Embedded Linux sections.David Boddie2010-01-281-2/+2
| | * | | Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | * | | Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | * | | googlesuggest example: Add newline to end of fileMarkus Goetz2010-01-282-2/+4
| | * | | Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-2810-14/+15
| | * | | Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2946-70/+68
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2846-70/+68
| |\ \ \ |/ / / /
| * | | Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2846-70/+68
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2812-9/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-28110-643/+2880
| |\ \ \
| | * | | Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| | * | | don't build unneeded QtDesigner parts on Windows CEJoerg Bornemann2010-01-281-3/+1
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-281-3/+35
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
| * | | | Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-289-3/+14
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2844-201/+404
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-287-8/+739
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1Prasanth Ullattil2010-01-287-8/+739
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | doc: Fixed the last qdoc errors.Martin Smith2010-01-282-8/+13
| |/ / / /
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2844-586/+1066
| |\ \ \ \
| | * | | | Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
| | * | | | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-271-2/+2
| | * | | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-274-36/+127
| | * | | | Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-271-2/+2
| | * | | | Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-271-1/+1
| | * | | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-271-0/+7
| | * | | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-272-0/+25