diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 13:01:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 13:09:29 +0200 |
| commit | 576a8e152ec36e7465bfdc8ad63998cffbab4091 (patch) | |
| tree | 07472de61c7542a90f675869e480b99076c5b439 /src/widgets/kernel/qboxlayout.h | |
| parent | fb7f30d2bad0c84ffea4db862a71ba2e03d855d0 (diff) | |
| parent | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (diff) | |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'src/widgets/kernel/qboxlayout.h')
| -rw-r--r-- | src/widgets/kernel/qboxlayout.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index aac46ef1ec..9b1dace5ed 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -84,6 +84,7 @@ public: void insertSpacerItem(int index, QSpacerItem *spacerItem); void insertWidget(int index, QWidget *widget, int stretch = 0, Qt::Alignment alignment = 0); void insertLayout(int index, QLayout *layout, int stretch = 0); + void insertItem(int index, QLayoutItem *); int spacing() const; void setSpacing(int spacing); @@ -107,9 +108,6 @@ public: QLayoutItem *takeAt(int); int count() const; void setGeometry(const QRect&); -protected: - // ### Qt 5: make public - void insertItem(int index, QLayoutItem *); private: Q_DISABLE_COPY(QBoxLayout) |