summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-265-31/+200
|\
| * QColorDialog::open() freezes the app the *second* time it is used on MacCarlos Manuel Duclos Vergara2010-02-231-2/+8
| * Build fix for 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.Carlos Manuel Duclos Vergara2010-02-221-2/+4
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-224-27/+188
| |\
| | * QFontDialog::exec() never returns on OSXCarlos Manuel Duclos Vergara2010-02-224-27/+188
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-202-7/+5
|\ \ \
| * \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-181-1/+1
| |\ \ \
| * | | | Replaced the numCopies()/setNumCopies() and actualNumCopies() API.Trond Kjernåsen2010-02-152-7/+5
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-4/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | ColorDialog is always shown as stripped-down version (for QVGA)Sami Merila2010-02-191-4/+2
| | |/ | |/|
* | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| |/ |/|
* | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-102-5/+6
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-2/+1
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-011-2/+1
| |\
| | * Doc fix. No need to put something deprecated if it's not.Alexis Menard2010-01-291-2/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-081-46/+38
|\ \ \
| * | | Fixed handling of paths containing ".." in QFileSystemModel on Windows.Robert Loehning2010-02-011-46/+38
* | | | QFileDialog: Compilation fix on windowsThierry Bastian2010-02-032-23/+17
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-021-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| | |/ | |/|
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-0/+10
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-251-0/+10
| |\ \
| | * | Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-221-0/+10
* | | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-017-40/+103
|\ \ \ \
| * | | | Fix compile on MSVC 2003. ARRAYSIZE macro doesn't exit.Alexis Menard2010-01-261-1/+1
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+26
| | | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-222-30/+55
| | | |\ \ \
| | | | * | | build fix for mingwThierry Bastian2010-01-181-1/+9
| | | | * | | Build fix for MSVC2005 and older SDKThierry Bastian2010-01-182-30/+47
| * | | | | | Build fix for winceThierry Bastian2010-01-222-1/+2
| |/ / / / /
| * | | | | build fix for mingwThierry Bastian2010-01-221-1/+9
| * | | | | Build fix for MSVC2005 and older SDKThierry Bastian2010-01-222-30/+47
| |/ / / /
| * | | | Merge branch '4.6'Thiago Macieira2010-01-211-17/+28
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch '4.6'Thiago Macieira2010-01-183-16/+27
| |\ \ \ \
| * | | | | Implement showing the volume name for drives on Windows.Alexis Menard2010-01-142-2/+30
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-1360-61/+69
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-121-1/+8
| |\ \ \ \ \ \
| * | | | | | | Obsolete QDirModel and remove it from the doc.Alexis Menard2010-01-084-0/+13
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch '4.6'Thiago Macieira2010-01-084-26/+42
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-263-12/+44
| |\ \ \ \ \ \ \
| * | | | | | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-6/+1
| * | | | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-2/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-4/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-022-3/+6
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0161-131/+245
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-221-2/+2
| * | | | | | | | | | Fix for symbian dialog background transparency.Jani Hautakangas2010-01-221-0/+16
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| | |_|_|_|_|_|_|/ | |/| | | | | | |