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

This also reverts commit 018e670a26ff5a61b949100ae080f5e654e7bee8.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4

1 files changed, 40 insertions, 40 deletions

diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index b4f403fc0c..799b93c33b 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -104,7 +104,7 @@ void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db)
     QVERIFY_SQL( q, exec("insert into " + reltest1 + " values(5, 'nat', NULL, NULL)"));
     QVERIFY_SQL( q, exec("insert into " + reltest1 + " values(6, 'ale', NULL, 2)"));
 
-    QVERIFY_SQL( q, exec("create table " + reltest2 + " (tid int not null primary key, title varchar(20))"));
+    QVERIFY_SQL( q, exec("create table " + reltest2 + " (id int not null primary key, title varchar(20))"));
     QVERIFY_SQL( q, exec("insert into " + reltest2 + " values(1, 'herr')"));
     QVERIFY_SQL( q, exec("insert into " + reltest2 + " values(2, 'mister')"));
 
@@ -196,7 +196,7 @@ void tst_QSqlRelationalTableModel::data()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.columnCount(), 4);
@@ -241,7 +241,7 @@ void tst_QSqlRelationalTableModel::setData()
 
         model.setTable(reltest1);
         model.setSort(0, Qt::AscendingOrder);
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
 
         QVERIFY(model.setData(model.index(0, 1), QString("harry2")));
@@ -271,7 +271,7 @@ void tst_QSqlRelationalTableModel::setData()
         QCOMPARE(model.data(model.index(3, 1)).toString(), QString("boris2"));
         QCOMPARE(model.data(model.index(3, 2)).toInt(), 1);
 
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
         QCOMPARE(model.data(model.index(0, 2)).toString(), QString("mister"));
         QCOMPARE(model.data(model.index(3,2)).toString(), QString("herr"));
@@ -284,7 +284,7 @@ void tst_QSqlRelationalTableModel::setData()
         model.setTable(reltest1);
         model.setEditStrategy(QSqlTableModel::OnFieldChange);
         model.setSort(0, Qt::AscendingOrder);
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
 
         QVERIFY(model.setData(model.index(1,1), QString("trond2")));
@@ -302,7 +302,7 @@ void tst_QSqlRelationalTableModel::setData()
         QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond2"));
         QCOMPARE(model.data(model.index(2, 2)).toInt(), 2);
 
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
         QCOMPARE(model.data(model.index(2, 2)).toString(), QString("mister"));
     }
@@ -312,12 +312,12 @@ void tst_QSqlRelationalTableModel::setData()
         QSqlRelationalTableModel model(0, db);
 
         model.setTable(reltest1);
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
 
         //sybase doesn't allow tables with the same alias used twice as col names
         //so don't set up an identical relation when using the tds driver
         if (dbType != QSqlDriver::Sybase)
-            model.setRelation(3, QSqlRelation(reltest2, "tid", "title"));
+            model.setRelation(3, QSqlRelation(reltest2, "id", "title"));
 
         model.setEditStrategy(QSqlTableModel::OnManualSubmit);
         model.setSort(0, Qt::AscendingOrder);
@@ -346,9 +346,9 @@ void tst_QSqlRelationalTableModel::setData()
         QCOMPARE(model.data(model.index(3, 2)).toInt(), 1);
         QCOMPARE(model.data(model.index(0, 3)).toInt(), 1);
 
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         if (dbType != QSqlDriver::Sybase)
-            model.setRelation(3, QSqlRelation(reltest2, "tid", "title"));
+            model.setRelation(3, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
         QCOMPARE(model.data(model.index(3, 2)).toString(), QString("herr"));
 
@@ -406,7 +406,7 @@ void tst_QSqlRelationalTableModel::multipleRelation()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setRelation(3, QSqlRelation(reltest4, "id", "name"));
     model.setSort(0, Qt::AscendingOrder);
     QVERIFY_SQL(model, select());
@@ -420,7 +420,7 @@ void tst_QSqlRelationalTableModel::multipleRelation()
 
     // Redo same test in the LeftJoin mode
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setRelation(3, QSqlRelation(reltest4, "id", "name"));
     model.setSort(0, Qt::AscendingOrder);
     model.setJoinMode(QSqlRelationalTableModel::LeftJoin);
@@ -443,7 +443,7 @@ void tst_QSqlRelationalTableModel::insertRecord()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setSort(0, Qt::AscendingOrder);
     QVERIFY_SQL(model, select());
 
@@ -493,7 +493,7 @@ void tst_QSqlRelationalTableModel::setRecord()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setSort(0, Qt::AscendingOrder);
     QVERIFY_SQL(model, select());
 
@@ -554,11 +554,11 @@ void tst_QSqlRelationalTableModel::insertWithStrategies()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setSort(0, Qt::AscendingOrder);
 
     if (dbType != QSqlDriver::Sybase)
-        model.setRelation(3, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(3, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.data(model.index(0,0)).toInt(), 1);
@@ -662,7 +662,7 @@ void tst_QSqlRelationalTableModel::removeColumn()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     QVERIFY_SQL(model, removeColumn(3));
@@ -688,7 +688,7 @@ void tst_QSqlRelationalTableModel::removeColumn()
     QSqlRelationalTableModel lmodel(0, db);
 
     lmodel.setTable(reltest1);
-    lmodel.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    lmodel.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     lmodel.setJoinMode(QSqlRelationalTableModel::LeftJoin);
     QVERIFY_SQL(lmodel, select());
 
@@ -719,7 +719,7 @@ void tst_QSqlRelationalTableModel::filter()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setFilter("title = 'herr'");
 
     QVERIFY_SQL(model, select());
@@ -746,9 +746,9 @@ void tst_QSqlRelationalTableModel::sort()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     if (dbType != QSqlDriver::Sybase)
-        model.setRelation(3, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(3, QSqlRelation(reltest2, "id", "title"));
 
     model.setSort(2, Qt::DescendingOrder);
     QVERIFY_SQL(model, select());
@@ -874,7 +874,7 @@ void tst_QSqlRelationalTableModel::revert()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     model.setRelation(3, QSqlRelation(reltest4, "id", "name"));
 
     model.setSort(0, Qt::AscendingOrder);
@@ -912,10 +912,10 @@ void tst_QSqlRelationalTableModel::clearDisplayValuesCache()
     QSqlRelationalTableModel model(0, db);
 
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
 
     if (dbType != QSqlDriver::Sybase)
-        model.setRelation(3, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(3, QSqlRelation(reltest2, "id", "title"));
     model.setSort(1, Qt::AscendingOrder);
     model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 
@@ -1013,7 +1013,7 @@ void tst_QSqlRelationalTableModel::invalidData()
 
     QSqlRelationalTableModel model(0, db);
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     //try set a non-existent relational key
@@ -1043,7 +1043,7 @@ void tst_QSqlRelationalTableModel::relationModel()
 
     QSqlRelationalTableModel model(0, db);
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     QVERIFY(!model.relationModel(0));
@@ -1137,7 +1137,7 @@ void tst_QSqlRelationalTableModel::casing()
 
     QSqlRelationalTableModel model(0, db);
     model.setTable(qTableName("CASETEST1", db).toUpper());
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
@@ -1160,11 +1160,11 @@ void tst_QSqlRelationalTableModel::escapedRelations()
     //try with relation table name quoted
     if (dbType == QSqlDriver::Interbase || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::DB2) {
         model.setRelation(2, QSqlRelation(db.driver()->escapeIdentifier(reltest2.toUpper(),QSqlDriver::TableName),
-                            "tid",
+                            "id",
                             "title"));
     } else {
         model.setRelation(2, QSqlRelation(db.driver()->escapeIdentifier(reltest2,QSqlDriver::TableName),
-                            "tid",
+                            "id",
                             "title"));
 
     }
@@ -1185,11 +1185,11 @@ void tst_QSqlRelationalTableModel::escapedRelations()
     model.setJoinMode(QSqlRelationalTableModel::InnerJoin);
     if (dbType == QSqlDriver::Interbase || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::DB2) {
         model.setRelation(2, QSqlRelation(reltest2,
-                            db.driver()->escapeIdentifier("tid", QSqlDriver::FieldName).toUpper(),
+                            db.driver()->escapeIdentifier("id", QSqlDriver::FieldName).toUpper(),
                             "title"));
     } else {
         model.setRelation(2, QSqlRelation(reltest2,
-                            db.driver()->escapeIdentifier("tid", QSqlDriver::FieldName),
+                            db.driver()->escapeIdentifier("id", QSqlDriver::FieldName),
                             "title"));
     }
     QVERIFY_SQL(model, select());
@@ -1210,11 +1210,11 @@ void tst_QSqlRelationalTableModel::escapedRelations()
     if (dbType == QSqlDriver::Interbase || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::DB2) {
 
         model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
+                            "id",
                             db.driver()->escapeIdentifier("title", QSqlDriver::FieldName).toUpper()));
     } else {
         model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
+                            "id",
                             db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
     }
 
@@ -1235,11 +1235,11 @@ void tst_QSqlRelationalTableModel::escapedRelations()
     model.setJoinMode(QSqlRelationalTableModel::InnerJoin);
     if (dbType == QSqlDriver::Interbase || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::DB2) {
         model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
+                            "id",
                             db.driver()->escapeIdentifier("title", QSqlDriver::FieldName).toUpper()));
     } else {
         model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
+                            "id",
                             db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
     }
     QVERIFY_SQL(model, select());
@@ -1273,7 +1273,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
             model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
         }
         model.setSort(0, Qt::AscendingOrder);
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
 
         QVERIFY(model.setData(model.index(0, 1), QString("harry2")));
@@ -1303,7 +1303,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
         QCOMPARE(model.data(model.index(3, 1)).toString(), QString("boris2"));
         QCOMPARE(model.data(model.index(3, 2)).toInt(), 1);
 
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
         QCOMPARE(model.data(model.index(0, 2)).toString(), QString("mister"));
         QCOMPARE(model.data(model.index(3,2)).toString(), QString("herr"));
@@ -1320,7 +1320,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
             model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
         }
         model.setSort(0, Qt::AscendingOrder);
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         model.setJoinMode(QSqlRelationalTableModel::LeftJoin);
         QVERIFY_SQL(model, select());
 
@@ -1352,7 +1352,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
         QCOMPARE(model.data(model.index(3, 1)).toString(), QString("boris2"));
         QCOMPARE(model.data(model.index(3, 2)).toInt(), 1);
 
-        model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+        model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
         QVERIFY_SQL(model, select());
         QCOMPARE(model.data(model.index(0, 2)).toString(), QString("mister"));
         QCOMPARE(model.data(model.index(3,2)).toString(), QString("herr"));
@@ -1480,7 +1480,7 @@ void tst_QSqlRelationalTableModel::selectAfterUpdate()
 
     QSqlRelationalTableModel model(0, db);
     model.setTable(reltest1);
-    model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
+    model.setRelation(2, QSqlRelation(reltest2, "id", "title"));
     QVERIFY_SQL(model, select());
     QCOMPARE(model.relationModel(2)->rowCount(), 2);
     {