summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1422-65/+344
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-1422-65/+344
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1314-8/+133
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1314-8/+133
| | | |\
| | | | * Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | * tst_qftp: Attempting to reproduce a crashMarkus Goetz2010-04-131-0/+26
| | | | * QNAM HTTP: Do not pipeline with WebLogic serversMarkus Goetz2010-04-131-0/+2
| | | | * Autotest: update path location on the test serverThiago Macieira2010-04-133-3/+3
| | | | * Autotest: update location of fluke.gif on test serverThiago Macieira2010-04-131-1/+1
| | | | * Make qsTr work in global scopeKent Hansen2010-04-137-3/+100
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-131-0/+25
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Provide overview for Symbian capabilities.Frans Englich2010-04-131-0/+25
| | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-133-3/+15
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-04-135-5/+12
| | | |\
| | | | * Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | | * Make qmake possible to build with mingw using qmake.proMiikka Heikkinen2010-04-131-0/+1
| | | * | Not possible to show selected text in virtual keyboardSami Merila2010-04-131-2/+13
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-131-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix typos, there is no QT_NO_SSLMarkus Goetz2010-04-131-1/+1
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-133-53/+170
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * QS60Style: Single Click UI support for SD 9.2 time-boxSami Merila2010-04-133-53/+170
* | | | 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