summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorThorbjørn Lund Martsum <tmartsum@gmail.com>2012-03-10 14:31:15 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-14 11:37:18 +0100
commit8c3e5700a14ff52c2dfff5ab1b1fb47d7240aa02 (patch)
tree985856ca8413e86ef0f47f80a0acda0d552f587f /src/widgets
parentf254c5c8bf91a1d22c0f17c9842663cb68ee6b74 (diff)
Add two (forgotten) since 5.0
SHA for QWidget::hasHeightForWidth change: 466107107a85e7211c4b7f77b36ec50625657061 SHA for QAbstractItemDelegate::destoryeditor change 15f253a46aa45e2a9fa1055799fa2768ba49b9a3 Change-Id: Ic7e38c15f62eef22ab95414fad6e7b6c9c7d4f59 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.cpp2
-rw-r--r--src/widgets/kernel/qwidget.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 6184a5845a..ecba3e238f 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -243,6 +243,8 @@ QWidget *QAbstractItemDelegate::createEditor(QWidget *,
/*!
+ \since 5.0
+
A function called when the editor is no longer needed and should be
destroyed. The default behavior is a call to deleteLater on the editor.
It possible e.g. to avoid this delete by reimplementing this function.
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 1493f61972..be1782bc4d 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -9228,6 +9228,8 @@ int QWidget::heightForWidth(int w) const
/*!
+ \Since 5.0
+
Returns true if the widget's preferred height depends on its width; otherwise returns false.
*/
bool QWidget::hasHeightForWidth() const