Update Qt 5 port to match latest release

Update code base to match latest release of Qt.
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Change-Id: I02c2ff250ea8cd960938b81903e92b04c745ae9c
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

27 files changed, 32 insertions, 28 deletions

diff --git a/tests/tests.pri b/tests/tests.pri
index 7870a68f..e87fccea 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -1,4 +1,6 @@
 QT -= gui
+QT += testlib
+CONFIG += unittest
 
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5
@@ -10,6 +12,8 @@ QMFPATH=../../src/libraries/qmfclient
 DEPENDPATH += .
 INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
 LIBS += -L$$QMFPATH/build
+LIBS += -lqmfclient
+
 macx:LIBS += -F$$QMFPATH/build
 QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
 
diff --git a/tests/tst_locks/tst_locks.pro b/tests/tst_locks/tst_locks.pro
index fa9cf2ee..b837e02f 100644
--- a/tests/tst_locks/tst_locks.pro
+++ b/tests/tst_locks/tst_locks.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_locks
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_locks.cpp
 
diff --git a/tests/tst_longstream/tst_longstream.pro b/tests/tst_longstream/tst_longstream.pro
index ea2cef86..f2037192 100644
--- a/tests/tst_longstream/tst_longstream.pro
+++ b/tests/tst_longstream/tst_longstream.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_longstream
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_longstream.cpp
 
diff --git a/tests/tst_longstring/tst_longstring.pro b/tests/tst_longstring/tst_longstring.pro
index 7c820a30..353edd5a 100644
--- a/tests/tst_longstring/tst_longstring.pro
+++ b/tests/tst_longstring/tst_longstring.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_longstring
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_longstring.cpp
 
diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro
index e9d0268d..457cab94 100644
--- a/tests/tst_python_email/tst_python_email.pro
+++ b/tests/tst_python_email/tst_python_email.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_python_email
 
 DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
diff --git a/tests/tst_qcop/tst_qcop.pro b/tests/tst_qcop/tst_qcop.pro
index 7decfed7..4e3c1652 100644
--- a/tests/tst_qcop/tst_qcop.pro
+++ b/tests/tst_qcop/tst_qcop.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 QT += network
 TARGET = tst_qcop
-CONFIG += unitest qmfclient qtestlib
+CONFIG += unitest qmfclient
 
 SOURCES += tst_qcop.cpp
 
diff --git a/tests/tst_qlogsystem/tst_qlogsystem.pro b/tests/tst_qlogsystem/tst_qlogsystem.pro
index 4f1e08f6..e4fa530e 100644
--- a/tests/tst_qlogsystem/tst_qlogsystem.pro
+++ b/tests/tst_qlogsystem/tst_qlogsystem.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qlogsystem
 
 SOURCES += tst_qlogsystem.cpp
diff --git a/tests/tst_qmail_listmodels/tst_qmail_listmodels.pro b/tests/tst_qmail_listmodels/tst_qmail_listmodels.pro
index fb01d9ba..995051e0 100644
--- a/tests/tst_qmail_listmodels/tst_qmail_listmodels.pro
+++ b/tests/tst_qmail_listmodels/tst_qmail_listmodels.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_qmail_listmodels
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_qmail_listmodels.cpp
 
diff --git a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.pro b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.pro
index d15c9c10..d13ad512 100644
--- a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.pro
+++ b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_qmail_sortkeys
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_qmail_sortkeys.cpp
 
diff --git a/tests/tst_qmailaddress/tst_qmailaddress.pro b/tests/tst_qmailaddress/tst_qmailaddress.pro
index 5da4070e..5c7e8231 100644
--- a/tests/tst_qmailaddress/tst_qmailaddress.pro
+++ b/tests/tst_qmailaddress/tst_qmailaddress.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailaddress
 
 SOURCES += tst_qmailaddress.cpp
diff --git a/tests/tst_qmailcodec/tst_qmailcodec.pro b/tests/tst_qmailcodec/tst_qmailcodec.pro
index 8523a503..4aaaf3a4 100644
--- a/tests/tst_qmailcodec/tst_qmailcodec.pro
+++ b/tests/tst_qmailcodec/tst_qmailcodec.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailcodec
 
 SOURCES += tst_qmailcodec.cpp
diff --git a/tests/tst_qmaildisconnected/tst_qmaildisconnected.pro b/tests/tst_qmaildisconnected/tst_qmaildisconnected.pro
index aa6deeea..d1e8e45d 100644
--- a/tests/tst_qmaildisconnected/tst_qmaildisconnected.pro
+++ b/tests/tst_qmaildisconnected/tst_qmaildisconnected.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmaildisconnected
 
 SOURCES += tst_qmaildisconnected.cpp
diff --git a/tests/tst_qmaillog/tst_qmaillog.pro b/tests/tst_qmaillog/tst_qmaillog.pro
index 84759d76..ec3461fe 100644
--- a/tests/tst_qmaillog/tst_qmaillog.pro
+++ b/tests/tst_qmaillog/tst_qmaillog.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmaillog
 
 SOURCES += tst_qmaillog.cpp
diff --git a/tests/tst_qmailmessage/tst_qmailmessage.cpp b/tests/tst_qmailmessage/tst_qmailmessage.cpp
index cf4715fa..719a0b09 100644
--- a/tests/tst_qmailmessage/tst_qmailmessage.cpp
+++ b/tests/tst_qmailmessage/tst_qmailmessage.cpp
@@ -375,7 +375,7 @@ void tst_QMailMessage::toRfc2822()
                     foreach (const pair_type &pair, text_parts) {
                         QString tag("<ENCODED_TEXT_%1>");
                         QMailBase64Codec codec(QMailBase64Codec::Text);
-                        body_text.replace(tag.arg(i).toAscii(), codec.encode(pair.second, "UTF-8"));
+                        body_text.replace(tag.arg(i).toLatin1(), codec.encode(pair.second, "UTF-8"));
                         ++i;
                     }
                     rfc_text.append(body_text);
@@ -392,7 +392,7 @@ void tst_QMailMessage::toRfc2822()
                     foreach (const pair_type &pair, text_parts) {
                         QString tag("<ENCODED_TEXT_%1>");
                         QMailQuotedPrintableCodec codec(QMailQuotedPrintableCodec::Text, QMailQuotedPrintableCodec::Rfc2045);
-                        body_text.replace(tag.arg(i).toAscii(), codec.encode(pair.second, "UTF-8"));
+                        body_text.replace(tag.arg(i).toLatin1(), codec.encode(pair.second, "UTF-8"));
                         ++i;
                     }
                     rfc_text.append(body_text);
@@ -407,7 +407,7 @@ void tst_QMailMessage::toRfc2822()
                     int i = 0;
                     foreach (const pair_type &pair, text_parts) {
                         QString tag("<ENCODED_TEXT_%1>");
-                        body_text.replace(tag.arg(i).toAscii(), pair.second);
+                        body_text.replace(tag.arg(i).toLatin1(), pair.second);
                         ++i;
                     }
                     rfc_text.append(body_text);
diff --git a/tests/tst_qmailmessage/tst_qmailmessage.pro b/tests/tst_qmailmessage/tst_qmailmessage.pro
index 4ddc2eaa..9e932a89 100644
--- a/tests/tst_qmailmessage/tst_qmailmessage.pro
+++ b/tests/tst_qmailmessage/tst_qmailmessage.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailmessage
 
 SOURCES += tst_qmailmessage.cpp
diff --git a/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro b/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro
index fec7edf8..c78bbc11 100644
--- a/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro
+++ b/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailmessagebody
 
 SOURCES += tst_qmailmessagebody.cpp
diff --git a/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro b/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro
index 3a163bf9..474f23c1 100644
--- a/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro
+++ b/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailmessageheader
 
 SOURCES += tst_qmailmessageheader.cpp
diff --git a/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro b/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro
index 6ed3088e..0b7410b4 100644
--- a/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro
+++ b/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailmessagepart
 
 SOURCES += tst_qmailmessagepart.cpp
diff --git a/tests/tst_qmailmessageset/tst_qmailmessageset.pro b/tests/tst_qmailmessageset/tst_qmailmessageset.pro
index 7b82b08e..6735fece 100644
--- a/tests/tst_qmailmessageset/tst_qmailmessageset.pro
+++ b/tests/tst_qmailmessageset/tst_qmailmessageset.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_qmailmessageset
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_qmailmessageset.cpp
 
diff --git a/tests/tst_qmailnamespace/tst_qmailnamespace.pro b/tests/tst_qmailnamespace/tst_qmailnamespace.pro
index 86c87f83..6dbfa288 100644
--- a/tests/tst_qmailnamespace/tst_qmailnamespace.pro
+++ b/tests/tst_qmailnamespace/tst_qmailnamespace.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailnamespace
 
 SOURCES += tst_qmailnamespace.cpp
diff --git a/tests/tst_qmailserviceaction/tst_qmailserviceaction.pro b/tests/tst_qmailserviceaction/tst_qmailserviceaction.pro
index 9b21d1bd..e09e7a4e 100644
--- a/tests/tst_qmailserviceaction/tst_qmailserviceaction.pro
+++ b/tests/tst_qmailserviceaction/tst_qmailserviceaction.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailserviceaction
 
 SOURCES += tst_qmailserviceaction.cpp
diff --git a/tests/tst_qmailstorageaction/tst_qmailstorageaction.pro b/tests/tst_qmailstorageaction/tst_qmailstorageaction.pro
index d3b91b33..cd1319ec 100644
--- a/tests/tst_qmailstorageaction/tst_qmailstorageaction.pro
+++ b/tests/tst_qmailstorageaction/tst_qmailstorageaction.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailstorageaction
 
 SOURCES += tst_qmailstorageaction.cpp
diff --git a/tests/tst_qmailstore/tst_qmailstore.pro b/tests/tst_qmailstore/tst_qmailstore.pro
index 173d57ac..4ea57cf3 100644
--- a/tests/tst_qmailstore/tst_qmailstore.pro
+++ b/tests/tst_qmailstore/tst_qmailstore.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailstore
 
 QT += sql
diff --git a/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro b/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro
index 1589530b..36cdc68d 100644
--- a/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro
+++ b/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qmailstorekeys
 
 QT += sql
diff --git a/tests/tst_qmailthread/tst_qmailthread.pro b/tests/tst_qmailthread/tst_qmailthread.pro
index 897b6fba..5bd1149e 100644
--- a/tests/tst_qmailthread/tst_qmailthread.pro
+++ b/tests/tst_qmailthread/tst_qmailthread.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_qmailthread
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 
 SOURCES += tst_qmailthread.cpp
 
diff --git a/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro b/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro
index be5f26fa..e402d0a5 100644
--- a/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro
+++ b/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_qprivateimplementation
 
 SOURCES += tst_qprivateimplementation.cpp
diff --git a/tests/tst_storagemanager/tst_storagemanager.pro b/tests/tst_storagemanager/tst_storagemanager.pro
index f7c07ff0..de333ea2 100644
--- a/tests/tst_storagemanager/tst_storagemanager.pro
+++ b/tests/tst_storagemanager/tst_storagemanager.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG += qtestlib unittest qmfclient
+CONFIG += qmfclient
 TARGET = tst_storagemanager