summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qproxystyle.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-171-11/+11
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-171-9/+9
| | | | | | | | | | | | | | | | All the qdoc errors are fixed in QStringBuilder, but because the class is a template class and uses strange templates, qdoc gets very confused, and the resulting documentation for QStringBuilder is not complete and accurate. To fix this correctly will require changes to the qdoc program.
| * Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-161-45/+99
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
| * 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
| | | | | | Adding missing files for proxy style after commit 4d0cc0b9600f8530bb0e8712b4bb109d1810c4a7 Reviewed-by: trust me
* Merge of masterBradley T. Hughes2009-06-151-0/+366