1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index b580f0e840..0986da9707 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -233,8 +233,8 @@ class QDefaultItemEditorFactory : public QItemEditorFactory
 {
 public:
     inline QDefaultItemEditorFactory() {}
-    QWidget *createEditor(int userType, QWidget *parent) const Q_DECL_OVERRIDE;
-    QByteArray valuePropertyName(int) const Q_DECL_OVERRIDE;
+    QWidget *createEditor(int userType, QWidget *parent) const override;
+    QByteArray valuePropertyName(int) const override;
 };
 
 QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent) const
@@ -468,7 +468,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
 */
 
 /*!
-    \fn QItemEditorCreator::QItemEditorCreator(const QByteArray &valuePropertyName)
+    \fn template <class T> QItemEditorCreator<T>::QItemEditorCreator(const QByteArray &valuePropertyName)
 
     Constructs an editor creator object using \a valuePropertyName
     as the name of the property to be used for editing. The
@@ -480,12 +480,12 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
 */
 
 /*!
-    \fn QWidget *QItemEditorCreator::createWidget(QWidget *parent) const
+    \fn template <class T> QWidget *QItemEditorCreator<T>::createWidget(QWidget *parent) const
     \reimp
 */
 
 /*!
-    \fn QByteArray QItemEditorCreator::valuePropertyName() const
+    \fn template <class T> QByteArray QItemEditorCreator<T>::valuePropertyName() const
     \reimp
 */
 
@@ -524,18 +524,18 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase()
 */
 
 /*!
-    \fn QStandardItemEditorCreator::QStandardItemEditorCreator()
+    \fn template <class T> QStandardItemEditorCreator<T>::QStandardItemEditorCreator()
 
     Constructs an editor creator object.
 */
 
 /*!
-    \fn QWidget *QStandardItemEditorCreator::createWidget(QWidget *parent) const
+    \fn template <class T> QWidget *QStandardItemEditorCreator<T>::createWidget(QWidget *parent) const
     \reimp
 */
 
 /*!
-    \fn QByteArray QStandardItemEditorCreator::valuePropertyName() const
+    \fn template <class T> QByteArray QStandardItemEditorCreator<T>::valuePropertyName() const
     \reimp
 */
 
@@ -587,7 +587,7 @@ void QExpandingLineEdit::resizeToContents()
         originalWidth = oldWidth;
     if (QWidget *parent = parentWidget()) {
         QPoint position = pos();
-        int hintWidth = minimumWidth() + fontMetrics().width(displayText());
+        int hintWidth = minimumWidth() + fontMetrics().horizontalAdvance(displayText());
         int parentWidth = parent->width();
         int maxWidth = isRightToLeft() ? position.x() + oldWidth : parentWidth - position.x();
         int newWidth = qBound(originalWidth, hintWidth, maxWidth);