Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 6 insertions, 0 deletions

diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 341473e..111a987 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@@ -178,6 +178,11 @@ class QStyleControlElementDockWidgetData {
 		Qt::Orientation areaOrientation;
 };
 
+class QStyleControlElementToolBarWidgetData {
+	public:
+		Qt::Orientation orientation;
+};
+
 class QStyleControlElementGenericWidgetData {
 	public:
 		QStringList widgetObjectTypes;
@@ -270,6 +275,7 @@ class Q_EXPORT QStyleControlElementData {
 		Q_UINT32 frameStyle;
 		QRect sliderRect;
 		QPainter* activePainter;
+		QStyleControlElementToolBarWidgetData toolBarData;
 
 	public:
 		QStyleControlElementData();