summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-103-4/+23
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-073-4/+23
| |\
| | * Allow iteration over the Item.children propertyAaron Kennedy2010-04-072-3/+22
| | * CompileAaron Kennedy2010-04-071-1/+1
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-099-17/+45
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-061-1/+1
| |\ \
| | * | Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
| * | | Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-052-0/+32
| |\ \ \
| | * | | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| * | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| * | | | Fix crash in the fileiconprovider for WindowsJens Bache-Wiig2010-04-011-2/+4
| |/ / /
| * | | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-311-1/+2
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
|\ \ \
| * | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-062-4/+5
| |\ \ \
| | * | | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | * | | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | |/ | | |/|
| * | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| |/ /
* | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
* | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
* | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-0/+5
|/ /
* | Fix compilation warningsOlivier Goffart2010-04-011-2/+2
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-019-13/+79
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-319-14/+79
| |\ \
| | * | Remove the "Insert unicode control character" menu entry on X11.Pierre Rossi2010-03-314-8/+59
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-305-6/+20
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-305-6/+20
| | | |\ \
| | | | * | Do not override alternate background color in PlastiqueJens Bache-Wiig2010-03-291-1/+0
| | | | * | Fix QComboBox ignoring foreground role in some stylesJens Bache-Wiig2010-03-291-1/+9
| | | | * | Support EtchDisabledText with spin box on Windows styleJens Bache-Wiig2010-03-291-2/+6
| | | | * | Fixed a typo in the QDoubleValidotor doc.Denis Dzyubenko2010-03-291-1/+1
| | | | * | Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3132-1117/+2150
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-313-3/+3
| |\ \ \ \ \
| * | | | | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-313-0/+39
| * | | | | | Micro optimization after feedback from Jan-Arve.Alexis Menard2010-03-311-1/+1
| * | | | | | Show only one dialog when using QFileDialog on Mac.Alexis Menard2010-03-311-0/+6
| * | | | | | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7Thiago Macieira2010-03-301-0/+2
| * | | | | | Fix bad merge from 4.6.Thiago Macieira2010-03-301-2/+4
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30298-5160/+10977
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| | * | | | | | | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| | * | | | | | | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3029-1111/+2093
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Work-around Symbian 10.1's broken egl.hTom Cooksey2010-03-292-4/+9
| | | * | | | | Add some #warnings to debug Symbian EGL build failureTom Cooksey2010-03-291-0/+24
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-295-29/+66
| | | |\ \ \ \ \
| | | | * | | | | Don't try to resolve EGLImage function pointers if they are definedTom Cooksey2010-03-291-0/+2