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

12 years ago · 95354d1b51
parent f175db0cdb 22d1ab9ecc
commit 95354d1b51
1 changed files with 3 additions and 0 deletions
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@ -205,7 +205,10 @@ class QStyleControlElementTabBarData {
 		int currentTabIndex;
 		QTabBar::Shape shape;
 		TabIdentifierIndexMap identIndexMap;
+#ifdef Q_QDOC
+#else
 		QStyleControlElementGenericWidgetData cornerWidgets[4];
+#endif

 		enum CornerWidgetLocation {
 			CWL_TopLeft			= 0,