summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-155-3/+36
|\
| * Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-152-1/+21
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-151-2/+2
| |\
| | * Fix localFont path in fonts example.Yann Bodson2010-04-151-2/+2
| * | Output script errors in ScriptAction and StateChangeScriptMartin Jones2010-04-152-0/+13
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-14134-1266/+2184
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1410-70/+259
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-1410-70/+259
| | |\ \
| | | * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| | | * | Update to def files for 4.7.0-beta1Shane Kearns2010-04-148-65/+234
| | | * | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
| * | | | Don't create delegates when destroying view.Martin Jones2010-04-141-1/+4
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| |\ \ \
| | * | | Updates to the module documentationmae2010-04-143-4/+17
| * | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1493-1090/+1616
| | |\ \
| | | * | Revert "Removed double setting of _WIN32_WINNT"Olivier Goffart2010-04-133-8/+25
| | | * | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-132-5/+5
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1397-1119/+1628
| | | |\ \
| | | | * | removed a few warnings on wince buildsThierry Bastian2010-04-132-5/+5
| | | | * | Removed double setting of _WIN32_WINNTThierry Bastian2010-04-133-25/+8
| | | | * | QTreeView: remove dead code.Olivier Goffart2010-04-132-20/+0
| | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-13562-4071/+10574
| | | | |\ \
| | | | | * | Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."Olivier Goffart2010-04-1310-149/+16
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-13101-1083/+1760
| | | | | |\ \
| | | | | | * | build fix for S60Thierry Bastian2010-04-131-1/+1
| | | | | | * | Improve handling of QAction in soft key managerThierry Bastian2010-04-135-16/+22
| | | | | | * | Remove useless assertThierry Bastian2010-04-131-1/+0
| | | | | | * | qdrawhelper: fix optim in 2245641baOlivier Goffart2010-04-131-29/+88
| | | | * | | | doc: Clarify effect of QFont::NoFontMergingEskil Abrahamsen Blomfeldt2010-04-131-3/+5
| | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1295-1050/+1663
| | | | |\ \ \
| | | | | * | | QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPageOlivier Goffart2010-04-121-2/+2
| | | | | * | | accelerate QWindowsPipeWriter for bigger chunks of dataJoerg Bornemann2010-04-122-6/+4
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-12165-1840/+3540
| | | | | |\ \ \
| | | | | | * | | Fix flattening of largely scaled, thin, dashed beziers.Gunnar Sletta2010-04-121-4/+24
| | | | | | * | | Increased the precision used to flatten beziersGunnar Sletta2010-04-121-2/+2
| | | | | | * | | Fix QT_NO_MOVIETasuku Suzuki2010-04-124-0/+14
| | | | | | * | | Fix compile error with QT_NO_ACTION in QtGuiTasuku Suzuki2010-04-122-7/+20
| | | | | | * | | Fix QT_NO_COMPLETERTasuku Suzuki2010-04-121-1/+1
| | | | | | * | | Fix QT_NO_FSCOMPLETERTasuku Suzuki2010-04-121-0/+4
| | | | | | * | | Fix QT_NO_FILESYSTEMMODELTasuku Suzuki2010-04-121-0/+2
| | | | | | * | | Build fixThierry Bastian2010-04-121-10/+0
| | | | | | * | | Safeguard ourselves against corrupt registry values for cleartype gammaGunnar Sletta2010-04-121-0/+5
| | | | | | * | | fix cetest build properlyJoerg Bornemann2010-04-124-21/+24
| | | | | | * | | qdrawhelper: optimize the fetch transformed bilinear functionsOlivier Goffart2010-04-121-46/+46
| | | | | | * | | Compile fix for WinCEThierry Bastian2010-04-121-1/+7
| | | | | | * | | Make sure the selectionChanged signal is not called too muchThierry Bastian2010-04-123-1/+26
| | | | | | * | | Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-1231-633/+1460
| | | | | | |\ \ \