diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 18:21:33 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 18:21:33 +1000 |
commit | acc98b9b36c61bb661701cd98d70d2ebae4ee2f6 (patch) | |
tree | f645e38e3097a56e51457eb01a59de35460f62a0 | |
parent | 240e35ddeb6a71c99bcef53eccee206b02d72d85 (diff) | |
parent | e00b8105bfcf3d4e36275dea6355705ec5fdbc40 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Designer: Extend container extension.
-rw-r--r-- | tools/uilib/container.h | 7 | ||||
-rw-r--r-- | tools/uilib/container.qdoc | 27 |
2 files changed, 34 insertions, 0 deletions
diff --git a/tools/uilib/container.h b/tools/uilib/container.h index 89df461e02..f0d89faa08 100644 --- a/tools/uilib/container.h +++ b/tools/uilib/container.h @@ -65,6 +65,13 @@ public: virtual void addWidget(QWidget *widget) = 0; virtual void insertWidget(int index, QWidget *widget) = 0; virtual void remove(int index) = 0; + + virtual bool canAddWidget() const + // ### Qt6 remove body, provided in Qt5 for source compatibility to Qt4. + { return true; } + virtual bool canRemove(int index) const + // ### Qt6 remove body, provided in Qt5 for source compatibility to Qt4. + { Q_UNUSED(index); return true; } }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "com.trolltech.Qt.Designer.Container") diff --git a/tools/uilib/container.qdoc b/tools/uilib/container.qdoc index d9310515d3..f8e0670811 100644 --- a/tools/uilib/container.qdoc +++ b/tools/uilib/container.qdoc @@ -170,3 +170,30 @@ \sa addWidget(), insertWidget() */ + +/*! + \fn bool QDesignerContainerExtension::canAddWidget() const + + Returns whether a widget can be added. This determines whether + the context menu options to add or insert pages are enabled. + + This should return false for containers that have a single, fixed + page, for example QScrollArea or QDockWidget. + + \since 5.0 + \sa addWidget(), canRemove() +*/ + +/*! + \fn bool QDesignerContainerExtension::canRemove(int index) const + + Returns whether the widget at the given \a index can be removed. + This determines whether the context menu option to remove the current + page is enabled. + + This should return false for containers that have a single, fixed + page, for example QScrollArea or QDockWidget. + + \since 5.0 + \sa remove(), canAddWidget() +*/ |