summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-10-273-1/+15
|\
| * Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-10-2649-372/+450
| |\
| * | Fix possible crash in glyph cache when deleting and creating contextsEskil Abrahamsen Blomfeldt2011-10-253-1/+15
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-2628-102/+447
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-2528-102/+447
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
| | |\ \
| | | * | Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504Sami Merila2011-10-211-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-202-3/+35
| | |\ \ \ | | | |/ /
| | | * | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-202-3/+35
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-194-1/+16
| | |\ \ \ | | | |/ /
| | | * | Workaround to VideoCore III scissor bug.Jani Hautakangas2011-10-194-1/+16
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-10-191-6/+8
| | |\ \ \
| | | * | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-193-9/+18
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix to QGLWidget crashJani Hautakangas2011-10-183-9/+18
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-182-8/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Update def filesJani Hautakangas2011-10-182-8/+9
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-171-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Typo fixJani Hautakangas2011-10-141-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-171-2/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-10-171-2/+3
| | * | | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2011-10-1431-127/+348
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-131-2/+38
| | | |\ \ \ \
| | | | * | | | symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-15/+10
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Cannot flick to the end of a horizontal list view width LayoutMirroringMartin Jones2011-10-122-15/+10
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-1212-72/+231
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Backport more imports directory caching changes.Martin Jones2011-10-114-15/+20
| | | | * | | | Fix deployment for declarative tests, examples on SymbianDamian Jansen2011-10-044-9/+9
| | | | * | | | Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2Martin Jones2011-09-142-1/+21
| | | | * | | | Backport imports directory caching performance optimizationMartin Jones2011-09-126-56/+190
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-111-0/+29
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | * | | | | | Add new signals to indicate GPU resource usage.Jani Hautakangas2011-10-145-0/+66
| | * | | | | | symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
| | | |/ / / / | | |/| | | |
| | * | | | | Symbian - fix deleteLater not working from RunLShane Kearns2011-10-111-0/+29
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-10-2529-247/+235
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2210-66/+117
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-209-58/+97
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-1757-295/+591
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fix bug in QStringToBSTR.Jan-Arve Saether2011-10-141-8/+1
| * | | | | | | | Fix regression in ListViewJens Bache-Wiig2011-10-131-4/+4
| * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-108-19/+49
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed resource leak when setting QProgressBar style sheetTero Ahola2011-10-101-1/+2
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-1023-73/+263
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0723-73/+263
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85acJan-Arve Saether2011-10-101-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-074-48/+9
| * | | | | | | | | | fix possible race conditionsKonstantin Ritt2011-10-0715-26/+33
| * | | | | | | | | | simplify the code by using QSystemLibrary a bit smarterKonstantin Ritt2011-10-073-40/+26
| * | | | | | | | | | use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-073-37/+31