summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| |\
| | * Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-11/+0
|\ \ \ | |/ / |/| |
| * | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-152-4/+6
|\ \ | |/ |/|
| * Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| * Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-153-12/+89
|\ \ | |/
| * Merge commit 'c9faf2defa9fa3209e44e8a5c1ae2da8e630d379' into maemo/199755Aaron McCarthy2010-12-153-12/+89
| |\ |/ /
| * Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
| * Fix invalid configurations being added to bearermonitor list.Aaron McCarthy2010-12-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-4/+7
|\ \ | |/ |/|
| * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-141-0/+13
|\ \
| * | Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| * | Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-145-77/+35
|\ \ \
| * | | Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
| * | | Clarify that XmlListModel is read onlyBea Lam2010-12-141-2/+2
| * | | Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-143-55/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-1411-12/+157
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed a bug in the input methods on S60 with QGraphicsWebView.axis2010-12-143-3/+148
| * | | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-148-9/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-142-3/+4
|\ \ \ \
| * | | | QApplication: fix crash exit whith native windowsOlivier Goffart2010-12-142-3/+4
* | | | | 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