2 files changed, 32 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro
index a996dab23e..61054b40e4 100644
--- a/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro
+++ b/tests/auto/corelib/tools/qlatin1string/qlatin1string.pro
@@ -3,7 +3,7 @@ TARGET = tst_qlatin1string
 QT = core testlib
 SOURCES = tst_qlatin1string.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
-contains(QT_CONFIG,c++11): CONFIG += c++11
-contains(QT_CONFIG,c++14): CONFIG += c++14
+qtConfig(c++11): CONFIG += c++11
+qtConfig(c++14): CONFIG += c++14
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp b/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp
index 878b4b52b6..06e2e1cc45 100644
--- a/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp
+++ b/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp
@@ -44,12 +44,42 @@ class tst_QLatin1String : public QObject
     Q_OBJECT
 
 private Q_SLOTS:
+    void at();
+    void midLeftRight();
     void nullString();
     void emptyString();
     void relationalOperators_data();
     void relationalOperators();
 };
 
+
+void tst_QLatin1String::at()
+{
+    const QLatin1String l1("Hello World");
+    QCOMPARE(l1.at(0), QLatin1Char('H'));
+    QCOMPARE(l1.at(l1.size() - 1), QLatin1Char('d'));
+    QCOMPARE(l1[0], QLatin1Char('H'));
+    QCOMPARE(l1[l1.size() - 1], QLatin1Char('d'));
+}
+
+void tst_QLatin1String::midLeftRight()
+{
+    const QLatin1String l1("Hello World");
+    QCOMPARE(l1.mid(0),            l1);
+    QCOMPARE(l1.mid(0, l1.size()), l1);
+    QCOMPARE(l1.left(l1.size()),   l1);
+    QCOMPARE(l1.right(l1.size()),  l1);
+
+    QCOMPARE(l1.mid(6), QLatin1String("World"));
+    QCOMPARE(l1.mid(6, 5), QLatin1String("World"));
+    QCOMPARE(l1.right(5), QLatin1String("World"));
+
+    QCOMPARE(l1.mid(6, 1), QLatin1String("W"));
+    QCOMPARE(l1.right(5).left(1), QLatin1String("W"));
+
+    QCOMPARE(l1.left(5), QLatin1String("Hello"));
+}
+
 void tst_QLatin1String::nullString()
 {
     // default ctor