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

Conflicts:
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1

2 files changed, 39 insertions, 0 deletions

diff --git a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
index 93f4978ea6..9d435a0f7c 100644
--- a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
+++ b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
@@ -58,6 +58,11 @@ public:
         return QSqlResult::savePrepare(sqlquery);
     }
 
+    QVector<QVariant> boundValues() const
+    {
+        return QSqlResult::boundValues();
+    }
+
 protected:
     QVariant data(int /* index */) { return QVariant(); }
     bool isNull(int /* index */) { return false; }
diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
index 7e901d4b2c..ba6b4d1fbf 100644
--- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
+++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
@@ -53,6 +53,7 @@ public:
 
 private slots:
     void positionalToNamedBinding();
+    void parseOfBoundValues();
 
 };
 
@@ -66,6 +67,39 @@ void tst_QSqlResult::positionalToNamedBinding()
     TestSqlDriverResult result(&testDriver);
     QString query("INSERT INTO MYTABLE (ID, NAME, BIRTH) VALUES(?, ?, ?)");
     QVERIFY(result.savePrepare(query));
+    QCOMPARE(result.boundValues().count(), 3);
+}
+
+void tst_QSqlResult::parseOfBoundValues()
+{
+    TestSqlDriver testDriver;
+    TestSqlDriverResult result(&testDriver);
+    QVERIFY(result.savePrepare("SELECT :1 AS \":2\""));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT :1 AS ':2'"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT :1 AS [:2]"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]]]"));
+    QCOMPARE(result.boundValues().count(), 1);
+
+    QVERIFY(result.savePrepare("SELECT ? AS \"?\""));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT ? AS '?'"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT ? AS [?]"));
+    QCOMPARE(result.boundValues().count(), 1);
+
+    QVERIFY(result.savePrepare("SELECT ? AS \"'?\""));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT ? AS '?\"'"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT ? AS '?''?'"));
+    QCOMPARE(result.boundValues().count(), 1);
+    QVERIFY(result.savePrepare("SELECT ? AS [\"?']"));
+    QCOMPARE(result.boundValues().count(), 1);
 }
 
 QTEST_MAIN( tst_QSqlResult )