summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-0641-319/+866
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-0427-293/+555
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0276-673/+1500
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-291-0/+10
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call virtual setPosHelper during destructionAaron Kennedy2009-09-291-0/+10
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-29163-1989/+3533
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-1855-565/+1832
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to QSyntaxHighlighter not rehighlighting enoughmae2009-09-171-1/+1
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Alan Alpert2009-09-152-2/+18
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-1555-186/+1087
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1510-52/+36
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151098-5002/+5460
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-0810-61/+143
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash on QGraphicsItem destruction related to focus handling (redone)Kai Koehne2009-09-081-1/+3
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-0841-599/+891
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-0423-24/+850
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-09-0467-377/+2880
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0367-377/+2880
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call pure virtuals on deleting QGraphicsItemAaron Kennedy2009-09-041-1/+3
| | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-015-21/+66
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0116-169/+348
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-311088-14393/+14572
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-31101-767/+1552
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup 928e81b68e0b695662c7ee3dd0bfa409a7ca1ffdAaron Kennedy2009-08-271-15/+3
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Focus Scope support in GraphicsViewAaron Kennedy2009-08-275-88/+166
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bad merge of QVector3D.Michael Brasser2009-08-252-10/+0
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-25316-1938/+25142
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compilation (missing include)Kai Koehne2009-08-251-0/+1
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVector3D: missing implicit conversion to QVariantThomas Hartmann2009-08-252-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-119-119/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-106-16/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-104-102/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-094-102/+101
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMainWindow: update the separator size when the style changeOlivier Goffart2010-02-083-29/+39
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed regression.Erik Verbruggen2010-02-101-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-104-22/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-1048-293/+475
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0948-293/+475
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes qabstractslider autotestDenis Dzyubenko2010-02-081-2/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-064-27/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-064-27/+59
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes scrolling horizontally with a mouse wheel over sliders.Denis Dzyubenko2010-02-053-27/+57
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-0526-213/+853
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.David Boddie2010-02-051-0/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-069-120/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed casual crash in initializeDb (Symbian)Alessandro Portale2010-02-051-6/+5
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'inputContextFixes' into 4.6-s60axis2010-02-052-16/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \