From 194a56ea79a4aa11a01dda0491427bb5ba4b37fd Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 1 Dec 2015 17:44:34 -0800
Subject: QTest: Fix printing of values of Q_ENUMs

QMetaEnum::key(n) returns the n-th key, which is not necessarily the one
of value n. For the key of value n, we want QMetaEnum::valueToKey(n).

Change-Id: Ic90fe6b1cbe84978a02fffff141bf4a06074917a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 src/testlib/qtestcase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/testlib')

diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 9d79439e04..14ee0865eb 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -238,7 +238,7 @@ namespace QTest
     inline typename QtPrivate::QEnableIf<QtPrivate::IsQEnumHelper<T>::Value, char*>::Type toString(T e)
     {
         QMetaEnum me = QMetaEnum::fromType<T>();
-        return qstrdup(me.key(int(e))); // int cast is necessary to support enum classes
+        return qstrdup(me.valueToKey(int(e))); // int cast is necessary to support enum classes
     }
 
     template <typename T> // Fallback
-- 
cgit v1.2.3


From 72e3fcce387d72043dd0b9fbe06d6b720861c1e7 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@theqtcompany.com>
Date: Tue, 10 May 2016 14:54:24 +0200
Subject: Doc: Remove repository name from examplesinstallpath

Examples in binary packages now directly match the install path.

Change-Id: Ic1487bc766cfd3b0a0a340cc4ae4ba49d953eaa6
Task-number: QTBUG-52953
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/testlib/doc/qttestlib.qdocconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/testlib')

diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 72db51b925..0fafc733b1 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -4,7 +4,7 @@ project                 = QtTestLib
 description             = Qt Test Reference Documentation
 version                 = $QT_VERSION
 
-examplesinstallpath     = qtbase/testlib
+examplesinstallpath     = testlib
 
 qhp.projects            = QtTestLib
 
-- 
cgit v1.2.3


From 7248e97669373abe2950b6e36a6add45137e3ca4 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 11 May 2016 11:53:02 +0200
Subject: QtConcurrent/QtOpenGL(Extensions)/QtPrintSupport/QtTestLib/QtXml: add
 QT_NO_FOREACH

Mark these libraries as what they are: Q_FOREACH-free,
using QT_NO_FOREACH.

Change-Id: I2a567d9fe67e15e9b6f0784525810b553dc50e1f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/testlib/testlib.pro | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/testlib')

diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 85fb0cd2fe..372a69c3ed 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -64,6 +64,7 @@ SOURCES = qtestcase.cpp \
 
 DEFINES *= QT_NO_CAST_TO_ASCII \
     QT_NO_CAST_FROM_ASCII \
+    QT_NO_FOREACH \
     QT_NO_DATASTREAM
 embedded:QMAKE_CXXFLAGS += -fno-rtti
 wince: LIBS += \
-- 
cgit v1.2.3