summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Thierry Bastian2011-04-192-27/+39
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-27/+39
| |\
| | * Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-33/+19
| | |\
| | * | Doc: Fixed qdoc warnings.David Boddie2011-02-231-14/+34
| | * | Merge branch 'mimir' into 4.7David Boddie2011-02-231-13/+5
| | |\ \
| | | * | qdoc: Added the \caption command.Martin Smith2011-01-131-13/+5
| | | * | Merge branch '4.7' into mimirDavid Boddie2010-12-152-1/+9
| | | |\ \
| | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-042-5/+9
| | |\ \ \ \
* | | | | | | QFileSystemModel: Handle QDir::NoDot and QDir::NoDotDot for setFilterJonathan Liu2011-04-041-5/+7
* | | | | | | Cocoa: respect QT_NO_EXCEPTION in color dialogRichard Moe Gustavsen2011-03-241-0/+5
|/ / / / / /
* | | | | | Merge branch 'master-upstream'Thierry Bastian2011-03-102-4/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-041-1/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-243-42/+32
| | |\ \ \ \ \ \
| | * | | | | | | Remove useless processEventOlivier Goffart2011-02-171-1/+0
| * | | | | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-221-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-153-42/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-111-33/+19
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-101-33/+19
| | |\ \ \ \ \ \
| | | * | | | | | Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-33/+19
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1363-100/+134
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-162-7/+8
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-152-1/+9
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0712-81/+473
| | | |\ \ \ \ \
| | | * | | | | | doc: Corrections to linking errors in the docs.Martin Smith2010-11-011-4/+4
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-042-5/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-2063-66/+75
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1763-64/+73
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update copyright year to 2011.Jason McDonald2011-01-1063-64/+64
| | * | | | | Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| * | | | | | fix 'QChar::QChar(char)' is deprecatedKonstantin Ritt2011-01-111-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-241-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-241-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | QMessageBox wrong Show/Hide Details button labelRaul Metsma2010-12-211-1/+1
* | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-251-6/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-241-6/+18
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
* | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-241-30/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-30/+43
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Remove few compile warningsMiikka Heikkinen2010-12-201-2/+2
| | * | | | | Fix using QFileDialog statics in Symbian.Miikka Heikkinen2010-12-201-28/+41
| | | |_|_|/ | | |/| | |
* | | | | | Fixed a double selection in QFileDialog when savingThierry Bastian2010-12-221-0/+1
|/ / / / /
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-203-7/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-141-0/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-141-0/+8
| | |\ \ \
| | | * | | Cocoa: cannot use staysOnTop flag for native file dialogsRichard Moe Gustavsen2010-12-131-0/+8
| | | | |/ | | | |/|
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-101-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Corrected case on Symbian library.axis2010-12-101-1/+1
| | |/ /