summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix QFont related compilation errors on Mac OSX CarbonSamuli Piippo2011-11-012-3/+3
* Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-10-2657-375/+10951
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-10-2531-248/+353
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-251-0/+3
| | |\
| | | * Merge branch '4.8-upstream' into master-waterWater-Team2011-10-251-0/+3
| | | |\
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-2323-125/+338
| | |\| |
| | | * | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2313-66/+240
| | | |\ \
| | | * \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2110-59/+98
| | | |\ \ \
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-1987-641/+2606
| | |\| | | |
| | | * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-198-145/+1548
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-1879-496/+1058
| | | |\ \ \ \ \
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-161-1/+2
| | |\| | | | | |
| | | * | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-161-1/+2
| | | |\ \ \ \ \ \
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-15303-398/+576
| | |\| | | | | | |
| | | * | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-15303-398/+576
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-141-8/+1
| | |\| | | | | | | |
| | | * | | | | | | | Fix bug in QStringToBSTR.Jan-Arve Saether2011-10-141-8/+1
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-147-201/+1426
| | |\| | | | | | | |
| | | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-146-197/+1422
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix regression in ListViewJens Bache-Wiig2011-10-131-4/+4
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-118-19/+49
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-118-19/+49
| | | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-111-1/+2
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Fixed resource leak when setting QProgressBar style sheetTero Ahola2011-10-101-1/+2
| | * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-1050-308/+789
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-1037-139/+671
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0837-139/+671
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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
| | | * | | | | | | | | | | nativewifi bearer plugin: prefer DLL Safe Search modeKonstantin Ritt2011-10-071-14/+17
| | | * | | | | | | | | | | make QElapsedTimer use QSystemLibrary on winKonstantin Ritt2011-10-071-8/+6
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-074-18/+14
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-074-18/+14
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-0651-431/+995
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-062-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0549-431/+993
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-045-57/+26
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth()Mikko Knuutila2011-10-041-4/+4
| | | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-0410-62/+224
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-0422-108/+340
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0411-11/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-302-36/+93
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Fix bug in QGraphicsItem::isVisibleTo().Andreas Aardal Hanssen2011-09-292-9/+119
| | | * | | | | | | | | | | | | | | | | nano-opts, styling fixesKonstantin Ritt2011-09-292-11/+11
| | | * | | | | | | | | | | | | | | | | don't assume the PATH envvar is latin1-encodedKonstantin Ritt2011-09-291-1/+1
| | | * | | | | | | | | | | | | | | | | Set missing flags in the option when rendering QTreeView drag pixmapDavid Faure2011-09-295-40/+92
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-291-1/+1
| | |\| | | | | | | | | | | | | | | | |