summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtabwidget.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-08-04 09:14:17 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-04 09:14:17 +0200
commit673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch)
treeb37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/widgets/widgets/qtabwidget.h
parent9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff)
parent92c998afb66a2ec900d50cab57929c0a97ad46ac (diff)
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/widgets/widgets/qtabwidget.h')
-rw-r--r--src/widgets/widgets/qtabwidget.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h
index 447560f332..899b7a5dba 100644
--- a/src/widgets/widgets/qtabwidget.h
+++ b/src/widgets/widgets/qtabwidget.h
@@ -148,6 +148,8 @@ public:
void clear();
+ QTabBar* tabBar() const;
+
public Q_SLOTS:
void setCurrentIndex(int index);
void setCurrentWidget(QWidget *widget);
@@ -165,7 +167,6 @@ protected:
void keyPressEvent(QKeyEvent *);
void paintEvent(QPaintEvent *);
void setTabBar(QTabBar *);
- QTabBar* tabBar() const;
void changeEvent(QEvent *);
bool event(QEvent *);
void initStyleOption(QStyleOptionTabWidgetFrame *option) const;