summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-172-3/+7
|\
| * MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-1/+5
| * Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-166-36/+48
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1638-119/+277
| |\ \
| | * | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | * | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | * | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | * | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | * | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | * | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | * | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | * | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| * | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
* | | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| |_|/ |/| |
* | | 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
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \