summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Doc: Changed description to prevent confusion about managed widgets.David Boddie2011-01-101-3/+3
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1610-44/+59
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-161-2/+4
| |\
| | * Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-166-32/+28
| |\ \ | | |/ | |/|
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-152-14/+3
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1410-16/+44
| | |\ \
| | * | | Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| | * | | Make sure that d->init() is called from both ctors.Jan-Arve Sæther2010-12-141-1/+2
| | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-132-0/+10
| | |\ \ \
| | * | | | Fixes text jitter in QtQuick components when using the virtual keyboardGabriel de Dietrich2010-12-131-1/+1
| | * | | | Symbian specific input methods should use 'Text' mode as default caseSami Merila2010-12-131-1/+1
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-105-150/+184
| | |\ \ \ \
| | * | | | | Fix whitespace in qs60style.cppSami Merila2010-12-101-1/+1
| | * | | | | QDateTimeEdit is not showing correctly when resizes in symbianSami Merila2010-12-101-22/+16
| | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-091-1/+1
| | |\ \ \ \ \
| | * | | | | | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-089-42/+81
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-162-10/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve performance of clipping to a scaled QRectFLars Knoll2010-12-152-10/+25
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-151-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-162-14/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-152-14/+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
| | | |/ / / / / /
| | * | | | | | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
| | |/ / / / / /
* | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1532-214/+335
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1410-16/+44
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-141-0/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fixed a bug in the input methods on S60 with QGraphicsWebView.axis2010-12-141-0/+8
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-141-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | QApplication: fix crash exit whith native windowsOlivier Goffart2010-12-141-3/+3
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | 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-141-4/+0
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | qrgb565: Use the trivial qt_memconvert() and qt_rectconvert()Andreas Kling2010-12-131-4/+0
| | | | |/ / / / | | | |/| | | |
| | * | | | | | 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-upstream' into 4.7-docA-Team2010-12-132-0/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-102-0/+10
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-102-0/+10
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-0/+10
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-0/+10
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-098-42/+74
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| |