summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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
* | 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
| | |/
| * | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| |/
* | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-141-1/+1
|\ \
| * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-071-1/+1
| |\ \
| | * \ Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-0212-72/+435
| | |\ \
| | * \ \ Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-2311-30/+124
| | |\ \ \
| | * | | | Fix QFileDialog regression in symbianShane Kearns2010-10-201-1/+1
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
* | | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-2912-72/+435
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Corrected case on Symbian library.axis2010-11-261-1/+1
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-259-67/+430
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-248-9/+400
| | |\ \ \
| | | * | | Fix spacesJanne Koskinen2010-11-232-2/+2
| | | * | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-191-1/+1
| | | |\ \ \
| | | | * | | Add symbian scope for qfiledialog_symbian.cppMiikka Heikkinen2010-11-181-1/+1
| | | * | | | Corrected ASCII comparison and removed extra bracesTitta Heikkala2010-11-192-20/+15
| | | |/ / /
| | | * | | Removed extra cpp and done changes based on commentsTitta Heikkala2010-11-183-20/+14
| | | * | | Correct flags for Symbian file dialogsTitta Heikkala2010-11-181-1/+1
| | | * | | Documented usage of dialogs on SymbianTitta Heikkala2010-11-153-0/+8
| | | * | | Native file dialog on Symbian^3Titta Heikkala2010-11-153-9/+278
| | * | | | QMessageBox: change the documentation to reflect that it is application modalOlivier Goffart2010-11-221-58/+30
| | |/ / /
| * | | | Fix a namespace error and some warnings found by clangJiang Jiang2010-11-233-4/+4
| * | | | Fix some warnings on MacJiang Jiang2010-11-221-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-193-12/+41
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-0/+3
| |\ \ \ | | |/ /
| | * | Wordwrap QInputDialog label in SymbianJanne Koskinen2010-11-041-0/+3
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-11/+34
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-031-11/+34
| | |\ \
| | | * | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-211-11/+34
| | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-091-0/+6
| | | |\ \
| * | | \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-1/+4
| |\ \ \ \ \ | | |/ / / /