summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstyle.h
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-07-23 07:01:58 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-07-23 07:01:58 (GMT)
commit7465d6fca7ed193f71f2a68cd04e290c4436d4cf (patch)
tree78bf4f9ff97ea9a7499d9016bca58e694e5f0afd /src/gui/styles/qstyle.h
parentfa9a292388e93f128eac2ba4438f8b1e772a4782 (diff)
parent7fe100b56ccca40de193164d3ce19600cf50bdd4 (diff)
downloadQt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.zip
Qt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.tar.gz
Qt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/qstyle.h')
-rw-r--r--src/gui/styles/qstyle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h
index d79c39c..f22bf55 100644
--- a/src/gui/styles/qstyle.h
+++ b/src/gui/styles/qstyle.h
@@ -730,7 +730,7 @@ public:
SH_ItemView_DrawDelegateFrame,
SH_TabBar_CloseButtonPosition,
SH_DockWidget_ButtonsHaveFrame,
-
+ SH_ToolButtonStyle,
// Add new style hint values here
#ifdef QT3_SUPPORT