From 8c3e5700a14ff52c2dfff5ab1b1fb47d7240aa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= Date: Sat, 10 Mar 2012 14:31:15 +0100 Subject: [PATCH] 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 Reviewed-by: Stephen Kelly --- src/widgets/itemviews/qabstractitemdelegate.cpp | 2 ++ src/widgets/kernel/qwidget.cpp | 2 ++ 2 files changed, 4 insertions(+) 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