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

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/qgl.cpp
	src/opengl/qglpixelbuffer.cpp
	src/opengl/qglshaderprogram.cpp
	tests/auto/opengl/qglthreads/tst_qglthreads.cpp

Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5

1 files changed, 64 insertions, 0 deletions

diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 55cb67eed9..824f042ffc 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -195,6 +195,9 @@ private slots:
     void task_233829_data() { generic_data("QPSQL"); }
     void task_233829();
 
+    void QTBUG_12477_data() { generic_data("QPSQL"); }
+    void QTBUG_12477();
+
     void sqlServerReturn0_data() { generic_data(); }
     void sqlServerReturn0();
 
@@ -1247,6 +1250,26 @@ void tst_QSqlQuery::seek()
     QVERIFY( q.seek( 0 ) );
     QCOMPARE( q.at(), 0 );
     QCOMPARE( q.value( 0 ).toInt(), 1 );
+
+    QVERIFY(!q.seek(QSql::BeforeFirstRow));
+    QCOMPARE(q.at(), int(QSql::BeforeFirstRow));
+    QVERIFY(q.seek(1, true));
+    QCOMPARE(q.at(), 0);
+    QCOMPARE(q.value(0).toInt(), 1);
+
+    qint32 count = 1;
+    while (q.next()) ++count;
+
+    QCOMPARE(q.at(), int(QSql::AfterLastRow));
+
+    if (!q.isForwardOnly()) {
+        QVERIFY(q.seek(-1, true));
+        QCOMPARE(q.at(), count - 1);
+        QCOMPARE(q.value(0).toInt(), count);
+    } else {
+        QVERIFY(!q.seek(-1, true));
+        QCOMPARE(q.at(), int(QSql::AfterLastRow));
+    }
 }
 
 void tst_QSqlQuery::seekForwardOnlyQuery()
@@ -2992,6 +3015,47 @@ void tst_QSqlQuery::task_233829()
     QVERIFY_SQL(q,exec());
 }
 
+void tst_QSqlQuery::QTBUG_12477()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    if (!db.driverName().startsWith("QPSQL"))
+        QSKIP("PostgreSQL specific test");
+
+    QSqlQuery q(db);
+    QVERIFY_SQL(q, exec("SELECT 1::bit, '10101010000111101101'::varbit, "
+                              "'10101111011'::varbit(15), '22222.20'::numeric(16,2), "
+                              "'333333'::numeric(18), '444444'::numeric"));
+    QVERIFY_SQL(q, next());
+    QSqlRecord r = q.record();
+    QSqlField f;
+
+    f = r.field(0);
+    QCOMPARE(f.length(), 1);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(1);
+    QCOMPARE(f.length(), -1);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(2);
+    QCOMPARE(f.length(), 15);
+    QCOMPARE(f.precision(), -1);
+
+    f = r.field(3);
+    QCOMPARE(f.length(), 16);
+    QCOMPARE(f.precision(), 2);
+
+    f = r.field(4);
+    QCOMPARE(f.length(), 18);
+    QCOMPARE(f.precision(), 0);
+
+    f = r.field(5);
+    QCOMPARE(f.length(), -1);
+    QCOMPARE(f.precision(), -1);
+}
+
 void tst_QSqlQuery::sqlServerReturn0()
 {
     QFETCH( QString, dbName );