diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
| commit | 91518478d32a5d5ce188b02f92e744fc782dd687 (patch) | |
| tree | b1ac54dd94358b0ad406c22d80b40f871fd196eb /src/gui/kernel/qguiplatformplugin.cpp | |
| parent | 1e84041247505502fa3b3f4865126719321f70d3 (diff) | |
| parent | 40d8ec7118d5f39acec3f71d33a87f0483bd2b2b (diff) | |
| download | Qt-91518478d32a5d5ce188b02f92e744fc782dd687.zip Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.gz Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/kernel/qguiplatformplugin.cpp')
| -rw-r--r-- | src/gui/kernel/qguiplatformplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp index 2dd251b..c80c6d3 100644 --- a/src/gui/kernel/qguiplatformplugin.cpp +++ b/src/gui/kernel/qguiplatformplugin.cpp @@ -187,7 +187,7 @@ QString QGuiPlatformPlugin::styleName() #endif } -/* return an aditional default palette (only work on X11) */ +/* return an additional default palette (only work on X11) */ QPalette QGuiPlatformPlugin::palette() { #ifdef Q_WS_X11 |