Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2

1 files changed, 6 insertions, 36 deletions

diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index 194bd22493..747d5db782 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -67,6 +67,7 @@
 
 #include <limits.h>
 
+// keep in sync with QAbstractItemDelegate::helpEvent()
 #ifndef DBL_DIG
 #  define DBL_DIG 10
 #endif
@@ -102,7 +103,7 @@ public:
             return text;
         }
 
-    static QString valueToText(const QVariant &value, const QStyleOptionViewItem &option);
+    QString valueToText(const QVariant &value, const QStyleOptionViewItem &option) const;
 
     QItemEditorFactory *f;
     bool clipPainting;
@@ -332,40 +333,9 @@ void QItemDelegate::setClipping(bool clip)
     d->clipPainting = clip;
 }
 
-QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItem &option)
+QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItem &option) const
 {
-    QString text;
-    switch (value.userType()) {
-        case QMetaType::Float:
-            text = option.locale.toString(value.toFloat(), 'g');
-            break;
-        case QVariant::Double:
-            text = option.locale.toString(value.toDouble(), 'g', DBL_DIG);
-            break;
-        case QVariant::Int:
-        case QVariant::LongLong:
-            text = option.locale.toString(value.toLongLong());
-            break;
-        case QVariant::UInt:
-        case QVariant::ULongLong:
-            text = option.locale.toString(value.toULongLong());
-            break;
-        case QVariant::Date:
-            text = option.locale.toString(value.toDate(), QLocale::ShortFormat);
-            break;
-        case QVariant::Time:
-            text = option.locale.toString(value.toTime(), QLocale::ShortFormat);
-            break;
-        case QVariant::DateTime:
-            text = option.locale.toString(value.toDateTime().date(), QLocale::ShortFormat);
-            text += QLatin1Char(' ');
-            text += option.locale.toString(value.toDateTime().time(), QLocale::ShortFormat);
-            break;
-        default:
-            text = replaceNewLine(value.toString());
-            break;
-    }
-    return text;
+    return textForRole(Qt::DisplayRole, value, option.locale, DBL_DIG);
 }
 
 /*!
@@ -434,7 +404,7 @@ void QItemDelegate::paint(QPainter *painter,
     QRect displayRect;
     value = index.data(Qt::DisplayRole);
     if (value.isValid() && !value.isNull()) {
-        text = QItemDelegatePrivate::valueToText(value, opt);
+        text = d->valueToText(value, opt);
         displayRect = textRectangle(painter, d->textLayoutBounds(opt), opt.font, text);
     }
 
@@ -1061,7 +1031,7 @@ QRect QItemDelegate::rect(const QStyleOptionViewItem &option,
             return QRect(QPoint(0, 0), option.decorationSize);
         case QVariant::String:
         default: {
-            QString text = QItemDelegatePrivate::valueToText(value, option);
+            const QString text = d->valueToText(value, option);
             value = index.data(Qt::FontRole);
             QFont fnt = qvariant_cast<QFont>(value).resolve(option.font);
             return textRectangle(0, d->textLayoutBounds(option), fnt, text); }