summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Make sure posted events are always sent when calling processEvents() on Win32Bradley T. Hughes2009-11-111-0/+5
* Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1015-199/+584
|\
| * 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-102-42/+14
|\ \ | |/
| * Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| * 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-1046-228/+1087
|\ \ | |/
| * Fix failing sub-src targetMarius Storm-Olsen2009-11-102-5/+7
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-11-1010-7/+845
| |\
| | * 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-1033-212/+227
| |/
| * Changes to low-level audio API.Kurt Korbatits2009-11-1033-230/+212
| * Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-10260-2414/+5513
| |\
| | * 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-0533-212/+227
* | | Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-0979-323/+585
|\ \ \ | | |/ | |/|
| * | Dont set DontCreateNativeAncestors attribute.Denis Dzyubenko2009-11-091-1/+0
| * | Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-092-4/+11
| |\ \
| | * | QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-092-4/+11
| * | | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-099-9/+27
| |\ \ \
| * | | | Compile in 64bit with debugOlivier Goffart2009-11-091-1/+1
| * | | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-0971-197/+416
| |\ \ \ \
| | * | | | API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-0915-30/+45
| | * | | | API review: Rename numPages() -> pageCount()Marius Storm-Olsen2009-11-093-4/+17
| | * | | | API review: Rename numDigits() and setNumDigits()Marius Storm-Olsen2009-11-093-14/+36
| | * | | | API review: Rename numCols() -> colorCount()Marius Storm-Olsen2009-11-066-6/+28
| | * | | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-0633-129/+172
| | * | | | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-067-9/+22
| | * | | | API review: QMatrix::det() -> QMatrix::determinant(), matching math3dMarius Storm-Olsen2009-11-062-5/+16
| | * | | | API review: Add convenience functions using QMarginsMarius Storm-Olsen2009-11-066-0/+80
| * | | | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-094-120/+157
| |\ \ \ \ \
| | * | | | | Removing semi-colon at the end of namespaceJoão Abecasis2009-11-051-1/+1
| | * | | | | Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-052-6/+7
| | * | | | | Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
| | * | | | | Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-042-28/+74
| | * | | | | QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4