summaryrefslogtreecommitdiffstats
path: root/tools/qtconfig
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 00:18:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 00:18:25 (GMT)
commit7c555955e96bc188bfebdea2cd066d871f151b59 (patch)
tree71e8765fa2f82878cbb2b5505857bd5f09595228 /tools/qtconfig
parent7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167 (diff)
parent558acd8c8ff94c6fd1e96514a2dffb587a66bb2f (diff)
downloadQt-7c555955e96bc188bfebdea2cd066d871f151b59.zip
Qt-7c555955e96bc188bfebdea2cd066d871f151b59.tar.gz
Qt-7c555955e96bc188bfebdea2cd066d871f151b59.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools/qtconfig')
-rw-r--r--tools/qtconfig/paletteeditoradvanced.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 2728557..f59584e 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -182,6 +182,7 @@ QColorGroup::ColorRole PaletteEditorAdvanced::centralFromItem( int item )
}
QColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item )
+
{
switch( item ) {
case 0: