Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-11 | 9 | -17/+37 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-10 | 6 | -8/+24 |
| |\ | |||||
| | * | Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023 | Olivier Goffart | 2010-11-10 | 1 | -2/+2 |
| | * | Fix warnings | Olivier Goffart | 2010-11-10 | 1 | -4/+4 |
| | * | Fix crash in tst_QByteArray::qUncompress | Olivier Goffart | 2010-11-10 | 1 | -0/+10 |
| | * | Support glyph subpixel positioning without subpixel rendering | Jiang Jiang | 2010-11-10 | 4 | -4/+10 |
| * | | Update the text cursor's position for input method events. | Pierre Rossi | 2010-11-10 | 2 | -0/+4 |
| |/ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-08 | 1 | -9/+9 |
| |\ | |||||
| | * | Make qsTr() work with Unicode (non-Latin-1) strings | Kent Hansen | 2010-11-08 | 1 | -9/+9 |
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-09 | 6 | -92/+91 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-08 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Task-number: QTBUG-15059 | juhvu | 2010-11-08 | 1 | -1/+1 |
| * | | Revert "QPointer: assert when using QPointer on destroyed QObject" | Olivier Goffart | 2010-11-08 | 1 | -2/+0 |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-06 | 6 | -91/+92 |
| |\ \ | |||||
| | * | | Silence warning in qvector with MSVC | Olivier Goffart | 2010-11-05 | 1 | -3/+3 |
| | * | | QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetS... | Olivier Goffart | 2010-11-05 | 2 | -85/+74 |
| | * | | QStyleSheetStyle: add a way to style the up arrow | Olivier Goffart | 2010-11-05 | 1 | -0/+4 |
| | * | | QPointer: assert when using QPointer on destroyed QObject | Olivier Goffart | 2010-11-05 | 1 | -0/+2 |
| | * | | Add missing Q_ENUMS to QAbstractSocket | Olivier Goffart | 2010-11-05 | 1 | -0/+1 |
| | * | | Fix QMenu rendering in the unified toolbar | Fabien Freling | 2010-11-05 | 1 | -3/+8 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-07 | 26 | -77/+135 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-06 | 9 | -32/+41 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-05 | 9 | -32/+41 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-05 | 9 | -32/+41 |
| | | |\ \ | |||||
| | | | * | | Optimize and clean up QClipData::fixup() | Andreas Kling | 2010-11-04 | 1 | -18/+20 |
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-04 | 8 | -14/+21 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-03 | 9 | -14/+23 |
| | | | | |\ \ | |||||
| | | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-03 | 9 | -14/+23 |
| | | | | | |\ \ | |||||
| | | | | | | * | | Fixed whitespace. | David Boddie | 2010-11-02 | 1 | -1/+1 |
| | | | | | | * | | Fixed destination path for the S60 feedback plugin. | David Boddie | 2010-11-02 | 1 | -0/+2 |
| | | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-01 | 8 | -14/+21 |
| | | | | | | |\ \ | |||||
| | | | | | | | * | | Push and pop the thread-default context for the current thread | Philip Van Hoof | 2010-11-01 | 1 | -0/+7 |
| | | | | | | | * | | Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. | Thiago Macieira | 2010-11-01 | 1 | -1/+1 |
| | | | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-01 | 6 | -13/+13 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | QNAM HTTP: Do not set cache headers when already set by user | Robert Hogan | 2010-11-01 | 1 | -4/+6 |
| | | | | | | | | * | | QNAM: Do not cache network connections per username. | Robert Hogan | 2010-11-01 | 1 | -1/+1 |
| | | | | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-01 | 5 | -8/+6 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-30 | 5 | -8/+6 |
| | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-30 | 5 | -8/+6 |
| | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-29 | 5 | -8/+6 |
| | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | * | | Don't crash when null-pointer is passed to qScriptValueFromValue() | Kent Hansen | 2010-10-29 | 1 | -4/+1 |
| | | | | | | | | | | | | * | | Simplify object lifetime management when moving objects to a QThread | Bradley T. Hughes | 2010-10-29 | 3 | -3/+3 |
| | | | | | | | | | | | | * | | Merge remote branch 'scm/qt/master' | Tor Arne Vestbø | 2010-10-28 | 15 | -19/+67 |
| | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | * | | | Don't put Objective-C sources in SOURCES | Tor Arne Vestbø | 2010-10-27 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 17 | -45/+94 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-05 | 5 | -9/+50 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fix tst_symbols auto test | Harald Fernengel | 2010-11-04 | 1 | -5/+5 |
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-04 | 5 | -8/+49 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | trivial: fix build | Harald Fernengel | 2010-11-03 | 1 | -2/+2 |
| | | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-11-03 | 5 | -8/+49 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |