summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-145-7/+24
|\
| * Cocoa: popup hides behind windowRichard Moe Gustavsen2010-12-131-1/+1
| * Cocoa: combobox does not hightlight when mouse re-hovers the first itemRichard Moe Gustavsen2010-12-131-1/+1
| * Cocoa: Fix addChildWindow bug where we connect a grandparent to a childRichard Moe Gustavsen2010-12-131-2/+2
| * Cocoa: cannot use staysOnTop flag for native file dialogsRichard Moe Gustavsen2010-12-131-0/+8
| * Cocoa: make sure stays on top child windows are not levelled downRichard Moe Gustavsen2010-12-131-2/+10
| * Cocoa: native child filedialogs sometimes shows non-native on screenRichard Moe Gustavsen2010-12-131-1/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-142-6/+2
|\ \
| * | Abort working replies with error when network session fails.Aaron McCarthy2010-12-141-2/+2
| * | qrgb565: Use the trivial qt_memconvert() and qt_rectconvert()Andreas Kling2010-12-131-4/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-143-0/+55
|\ \ \
| * | | Remove active selection when TextEdit loses focusJoona Petrell2010-12-143-0/+55
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-144-30/+15
|\ \ \ \
| * | | | Non-hacky fix for qwidget autotestMiikka Heikkinen2010-12-131-27/+5
| * | | | Fix qapplication autotest deploymentMiikka Heikkinen2010-12-131-1/+1
| * | | | Minor optimizationMiikka Heikkinen2010-12-131-2/+2
| * | | | Fix crash when creating more than one QApplication in single test caseMiikka Heikkinen2010-12-131-0/+7
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-132-5/+49
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-132-5/+49
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-131-9/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Add a small protection against releasing a timer twice.Thiago Macieira2010-12-131-2/+12
| * | | Use constants the timer ID masks instead of values everywhereThiago Macieira2010-12-131-4/+8
| * | | Fix ABA problem with: the serial must be updated on all accessesThiago Macieira2010-12-131-1/+1
| * | | Comment a bit more the timer ID allocation code.Thiago Macieira2010-12-131-2/+22
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-135-3/+66
|\ \ \ \ | |_|/ / |/| | |
| * | | Ensure ListView contentHeight is set to a valid size.Martin Jones2010-12-133-0/+63
| * | | Revert "Add mirroring-positioners.qml example" that was accidentally pushedJoona Petrell2010-12-131-70/+0
| * | | Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| * | | Add mirroring-positioners.qml exampleJoona Petrell2010-12-131-0/+70
| * | | A QAIM model resulted in items moving to incorrect locationsMartin Jones2010-12-131-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-131-0/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Add expected failures for JS test suite on SymbianKent Hansen2010-12-131-0/+10
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1337-145/+683
|\ \ \ | |/ /
| * | Build on SymbianMartin Jones2010-12-121-13/+13
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1137-138/+676
| |\ \ |/ / /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| | |\ \
| | | * | QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| | | * | QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| | | * | QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | * | PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-102-1/+5
| | | * | Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1027-88/+613
| | | |\ \
| | | | * | Improvements to anchoring docsBea Lam2010-12-092-17/+51
| | | | * | QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| | | | | |\ \
| | | | | | * | Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
| | | | | | * | Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-0921-77/+308
| | | | | | |\ \
| | | | | | * | | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-096-20/+44