summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
* Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
* Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1016-217/+805
|\
| * Add my changes to the 4.6.0 changelog.Bradley T. Hughes2009-11-101-2/+56
| * Added my changes in Qt 4.6.0 to the change log.Kim Motoyoshi Kalland2009-11-101-2/+5
| * Added my changelog entries.axis2009-11-101-0/+5
| * Add some of my changes to changes-4.6.0Eskil Abrahamsen Blomfeldt2009-11-101-1/+44
| * Added my changes to changes-4.6.0.Kim Motoyoshi Kalland2009-11-101-0/+23
| * Changelog: My changes.Thiago Macieira2009-11-101-15/+58
| * Updated changelog with my changesBenjamin Poulain2009-11-101-0/+15
| * Richards changes into the changelogRichard Moe Gustavsen2009-11-101-0/+17
| * Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-OlsenMarius Storm-Olsen2009-11-101-1/+1
| * Re-apply change 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg BornemannJoerg Bornemann2009-11-101-0/+11
| * Re-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane KearnsShane Kearns2009-11-101-0/+15
| * Re-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David BoddieDavid Boddie2009-11-101-0/+17
| * Re-apply change 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago MacieiraThiago Macieira2009-11-101-0/+37
| * Re-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago MacieiraThiago Macieira2009-11-101-1/+2
| * Re-apply change 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David BoddieDavid Boddie2009-11-102-7/+91
| * Re-apply change b065fda13c29110fc81f77c9bbf1069d562b4d67 by Martin SmithMartin Smith2009-11-101-1/+1
| * Re-apply change fdb9419f23d1cd2a9ddfc1f7e2fb58f6e845483b by Jocelyn TurcotteJocelyn Turcotte2009-11-101-2/+6
| * Re-apply change 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QILiang QI2009-11-104-2/+10
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 363...Jocelyn Turcotte2009-11-1024-390/+598
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-104-59/+163
|\ \ | |/
| * Extending QScopedPointer test caseJoão Abecasis2009-11-101-17/+139
| * Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| * My changes for 4.6.0Paul Olav Tvete2009-11-101-0/+10
| * QNAM HTTP Code: Start authorization header with capital letterMarkus Goetz2009-11-101-2/+2
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-0/+33
|\ \ | |/
| * Updated changelog with my changesTom Cooksey2009-11-101-0/+33
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1054-265/+1161
|\ \ | |/
| * Fix failing sub-src targetMarius Storm-Olsen2009-11-102-5/+7
| * Update change log with multimedia changes.Andrew den Exter2009-11-101-0/+6
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-11-1011-7/+873
| |\
| | * update changelogDerick Hawcroft2009-11-101-0/+3
| | * update dist/changes-4.6.0Bill King2009-11-101-0/+25
| | * Add QScriptDeclarativeClassAaron Kennedy2009-11-109-6/+826
| | * added missing include for template instantiation (in qDeleteAll)mae2009-11-101-1/+1
| | * During a GC mark the scope chain of QScriptContextsAaron Kennedy2009-11-101-0/+18
| * | Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| * | Changes to low-level audio API.Kurt Korbatits2009-11-1040-249/+267
| |/
| * Changes to low-level audio API.Kurt Korbatits2009-11-1040-270/+249
| * Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-10464-4690/+11221
| |\
| | * Don't reset view if a query fails.Derick Hawcroft2009-11-091-4/+5
| * | Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-091-0/+3
| * | Changes to low-level audio API.Kurt Korbatits2009-11-0540-249/+267
* | | Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-09125-1381/+1758
|\ \ \ | | |/ | |/|
| * | Dont set DontCreateNativeAncestors attribute.Denis Dzyubenko2009-11-091-1/+0
| * | Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-095-33/+46
| |\ \
| | * | QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-094-29/+43
| | * | Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3