summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Mac: submenu shows up at the wrong positionRichard Moe Gustavsen2010-02-151-23/+19
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1314-35/+177
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1314-35/+177
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1214-35/+177
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Fabien Freling2010-02-1277-531/+877
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1213-34/+168
| | | | |\
| | | | | * Wrong cursor shown by the parent window after setOverrideCursor().Prasanth Ullattil2010-02-111-0/+11
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1112-34/+157
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1112-34/+157
| | | | | | |\
| | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1063-374/+663
| | | | | | | |\
| | | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1011-19/+144
| | | | | | | | |\
| | | | | | | | | * Cocoa: Implement our own NSApplication subclassRichard Moe Gustavsen2010-02-106-48/+89
| | | | | | | | | * Cocoa: Menu in menubar stays highlightedRichard Moe Gustavsen2010-02-108-3/+87
| | | | | | | * | | Doc: Tidied up the class layout and removed an unnecessary image.David Boddie2010-02-091-15/+13
| | | * | | | | | | Fix QRegion under Mac OS X.Fabien Freling2010-02-121-1/+9
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1318-246/+314
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-125-102/+112
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Explicitly pass size to standard pixmap icon loaders.Michael Brasser2010-02-121-95/+95
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-114-7/+17
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-104-7/+17
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-093-4/+12
| | | | |\ \ \ \
| | | | | * | | | Add empty constructor for validators.Alan Alpert2010-02-081-2/+3
| | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052-2/+9
| | | | | |\ \ \ \
| | | | | | * | | | Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052-2/+10
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-042-2/+10
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Add bug note.Michael Brasser2010-02-041-1/+1
| | | | | | | | * | | | Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan.Joona Petrell2010-02-031-2/+3
| | | | | | | | * | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-0222-143/+226
| | | | | | | | |\ \ \ \
| | | | | | | | * | | | | Tests for NaN values in the property x, y, widht and height setters ofMarco Bubke2010-02-011-0/+6
| | | | | | | | * | | | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-2737-385/+1406
| | | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-204-17/+53
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1922-60/+169
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacingWarwick Allison2010-01-141-1/+9
| | | | | | | | * | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141118-1424/+1591
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | Compile fix for QMLViewerThomas Hartmann2010-01-081-2/+2
| | | | | | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-0528-187/+624
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1779-1048/+1613
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1034-392/+741
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | Fix crash.Michael Brasser2009-12-081-0/+1
| | | | | | | | * | | | | | | | | | | | Fix crash.Michael Brasser2009-12-081-1/+1
| | | | | | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-2/+10
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-0750-406/+529
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-3023-417/+236
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-2789-518/+912
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-19110-784/+936
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-122-3/+10
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \