summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug in resizing the anomaly browser demo.Benjamin Poulain2009-12-181-2/+3
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-1813-297/+412
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-182-88/+70
| |\
| | * Improve the performance of the Anomaly browser demoBenjamin Poulain2009-12-182-88/+70
| * | doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-182-10/+11
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-18191-3078/+5950
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-187-197/+329
| | |\
| | | * Fixed QResource to respect the explicitely set localeDenis Dzyubenko2009-12-172-1/+23
| | | * Change QHostInfo to use 5 parallel lookup threadsMarkus Goetz2009-12-174-195/+305
| | | * Doc: fix typoVolker Hilsheimer2009-12-171-1/+1
| | | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-12-170-0/+0
| | | |\
| | | | * fix Cocoa buildPeter Hartmann2009-12-151-1/+1
| * | | | doc: Fixed typos.Martin Smith2009-12-182-2/+2
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2009-12-184-14/+39
|\ \ \ \ \
| * | | | | Check if the scene exists before attempting to set its focus item.Michael Brasser2009-12-181-1/+1
| * | | | | The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| * | | | | no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-187-66/+62
|\ \ \ \ \ \
| * | | | | | Prevent access to non-existent memory in triagulating strokerRhys Weatherley2009-12-181-2/+8
| * | | | | | Align GL_RGB lines on a 4-byte boundary when uploading pixmap texturesRhys Weatherley2009-12-181-13/+2
| * | | | | | Cleanup qsqldatabase test case a little bit.Bill King2009-12-171-15/+9
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-174-36/+43
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-173-34/+41
| | * | | | | Doc: setFeature snippet was in the wrong placeJoerg Bornemann2009-12-171-2/+2
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2009-12-183-12/+43
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2009-12-173-12/+43
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| | * | | | | Configure support for multiple include levels in qmake.conf hierarchy.Harald Fernengel2009-12-171-9/+23
| | * | | | | Stop the configuration if the test compiler cannot be found.Harald Fernengel2009-12-171-0/+4
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-172-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| * | | | | | Fixed QCoeFepInputContext::widgetDestroyedMiikka Heikkinen2009-12-171-2/+1
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-172-12/+62
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1731-346/+253
| |\ \ \ \ \ \
| | * | | | | | Stack overflow when closing a Color panel in Cocoa.Prasanth Ullattil2009-12-171-12/+23
| * | | | | | | doc: Added discussion on connecting signals that have default arg values.Martin Smith2009-12-171-0/+39
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-171-4/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fixed parsing of svg paths.Kim Motoyoshi Kalland2009-12-171-4/+4
* | | | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-1743-200/+407
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Avoid timer starvation when handling many X11 eventsBradley T. Hughes2009-12-173-0/+9
| * | | | | | Disable benchlibwalltime test.Rohan McGovern2009-12-171-3/+3
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-1616-196/+52
| |\ \ \ \ \ \
| | * | | | | | Fixed wheel event delivery in graphicsview.Denis Dzyubenko2009-12-161-1/+1
| | * | | | | | An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
| | * | | | | | Doc fix: mark QFileOpenEvent::url to be available since 4.6Denis Dzyubenko2009-12-161-1/+3
| | * | | | | | Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | * | | | | | Text cursor is not shown properly in line edits on Mac OS X.Prasanth Ullattil2009-12-163-2/+18
| | * | | | | | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | * | | | | | Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-168-181/+17
| | |/ / / / /
| * | | | | | Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84