summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-20 18:42:04 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-10-20 18:42:04 -0500
commit95354d1b5116fa9e96534bef9a2f65c1976d4c12 (patch)
tree9c7742765d0426ed1774a456d9a977156ed2e865 /src
parentf175db0cdb14fe5e62b3fbdc785cd3b09576ef1d (diff)
parent22d1ab9eccc005b0497cff131593e6b9ff96e7c2 (diff)
downloadqt3-95354d1b5116fa9e96534bef9a2f65c1976d4c12.tar.gz
qt3-95354d1b5116fa9e96534bef9a2f65c1976d4c12.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src')
-rw-r--r--src/kernel/qstyle.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 1d20b8c..27dbb07 100644
--- 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,