summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qproxystyle.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-171-11/+11
|\
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-171-9/+9
| * Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-161-45/+99
|\ \ | |/
| * doc: Added info on two ways to customize the style.Martin Smith2009-06-161-1/+1
| * doc: Fixed several qdoc errors.Martin Smith2009-06-161-5/+8
| * doc: First review of QProxyStyle doc; mainly just corrected qdoc errors.Martin Smith2009-06-151-44/+95
| * CompileJens Bache-Wiig2009-06-121-0/+366
* Merge of masterBradley T. Hughes2009-06-151-0/+366