summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-256-9/+148
| | | |\ \ \ \ \ \
| | | | * | | | | | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-252-6/+129
| | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-252-0/+13
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-253-21/+53
| | | | | |\ \ \ \ \
| | | | * | | | | | | Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | | | * | | | | | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-251-2/+2
| | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-246-16/+16
| | | |\ \ \ \ \ \
| | | * | | | | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | QGraphicsEffect : Don't rely on the exposedArea when rendering the item into ...Alexis Menard2010-03-311-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Revert 4.6 commits that shouldn't be in 4.7.Thiago Macieira2010-03-317-1/+254
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3110-252/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-3110-255/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Add a children private property needed for QML to support QGraphicsOb...Alexis Menard2010-03-316-245/+0
| | * | | | | | | | Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| | * | | | | | | | Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-312-9/+1
| | * | | | | | | | Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry chan...Alexis Menard2010-03-312-4/+6
| | * | | | | | | | Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-312-3/+0
| | * | | | | | | | Add a workaround for a bug in Mac filesystem watcher.Alexis Menard2010-03-301-1/+1
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-306-1/+19
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-03-308-20/+53
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | struct -> class, it's better.Alexis Menard2010-03-301-1/+2
| | | | * | | | | | | Add a a layout property in QGraphicsWidget.Alexis Menard2010-03-302-0/+3
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+10
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix QFileSystemModel to not install useless watchers on the filesystemAlexis Menard2010-03-301-0/+10
| | | * | | | | | | | | Compile on MingWEskil Abrahamsen Blomfeldt2010-03-302-0/+4
| | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | QS60Style: Custom QPushButton: Heigth is calculated wronglySami Merila2010-03-301-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-305-19/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix a crash in QGtkStyle when theme not availableJens Bache-Wiig2010-03-301-0/+3
| * | | | | | | | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-291-10/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixed bitfield-related crash on Symbian WINSCWGareth Stockwell2010-03-291-10/+10
| * | | | | | | | | Compile with MSVC 2005 and 2003 when no platform SDK is usedAndy Shaw2010-03-291-0/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-294-15/+57
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | QS60Style: very tall QSpinBox's buttons hide lineEditSami Merila2010-03-291-9/+18
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-302-1/+19
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Make QDeclarativeListProperty a classAaron Kennedy2010-03-301-1/+2
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2628-134/+498
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Test and fix order of transform application.Warwick Allison2010-03-262-0/+17
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-2554-233/+572
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2528-134/+481
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2932-180/+589
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-262-2/+47
| |\ \ \ \ \ \ \
| | * | | | | | | QInputContextFactory::languages implementation for Symbian.Janne Anttila2010-03-262-2/+47
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-262-13/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Reverts using composition mode when using DeviceCoordinateMode cache.Yoann Lopes2010-03-261-7/+6
| | * | | | | | Fix linking errorAnders Bakken2010-03-261-6/+4
| * | | | | | | QS60Style cannot draw transparency to UI element border areasSami Merila2010-03-261-2/+0
| |/ / / / / /