Build fixes for Qt5 and remove some spurious DEPENDS_ON macros

as they do nothing.

Thanks to Valerio for the patch.

18 files changed, 55 insertions, 46 deletions

diff --git a/benchmarks/tst_messageserver/testmalloc.cpp b/benchmarks/tst_messageserver/testmalloc.cpp
index cc82e998..52b8e0c2 100644
--- a/benchmarks/tst_messageserver/testmalloc.cpp
+++ b/benchmarks/tst_messageserver/testmalloc.cpp
@@ -52,6 +52,14 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#define QATOMICINTVALUE(obj) obj
+#define QATOMICINTSTORE(obj,value) obj = value
+#else
+#define QATOMICINTVALUE(obj) obj.load()
+#define QATOMICINTSTORE(obj,value) obj.store(value)
+#endif
+
 /*
     Define this to have testmalloc do more extensive selftests to help verify
     that all allocations are going through our overridden allocator.
@@ -117,7 +125,7 @@ int TestMalloc::peakUsable()
 {
     if (!D) TestMallocPrivate::init();
     if (D->valid)
-        return D->peak_usable;
+        return QATOMICINTVALUE(D->peak_usable);
     else
         return -1;
 }
@@ -126,7 +134,7 @@ int TestMalloc::peakTotal()
 {
     if (!D) TestMallocPrivate::init();
     if (D->valid)
-        return D->peak_total;
+        return QATOMICINTVALUE(D->peak_total);
     else
         return -1;
 }
@@ -135,7 +143,7 @@ int TestMalloc::nowUsable()
 {
     if (!D) TestMallocPrivate::init();
     if (D->valid)
-        return D->now_usable;
+        return QATOMICINTVALUE(D->now_usable);
     else
         return -1;
 }
@@ -144,7 +152,7 @@ int TestMalloc::nowTotal()
 {
     if (!D) TestMallocPrivate::init();
     if (D->valid)
-        return D->now_usable + D->now_overhead;
+        return QATOMICINTVALUE(D->now_usable) + QATOMICINTVALUE(D->now_overhead);
     else
         return -1;
 }
@@ -152,15 +160,15 @@ int TestMalloc::nowTotal()
 void TestMalloc::resetPeak()
 {
     if (!D) TestMallocPrivate::init();
-    D->peak_usable.fetchAndStoreOrdered(D->now_usable);
-    D->peak_total.fetchAndStoreOrdered(D->now_usable + D->now_overhead);
+    D->peak_usable.fetchAndStoreOrdered(QATOMICINTVALUE(D->now_usable));
+    D->peak_total.fetchAndStoreOrdered(QATOMICINTVALUE(D->now_usable) + QATOMICINTVALUE(D->now_overhead));
 }
 
 void TestMalloc::resetNow()
 {
     if (!D) TestMallocPrivate::init();
-    D->now_usable = 0;
-    D->now_overhead = 0;
+    QATOMICINTSTORE(D->now_usable,0);
+    QATOMICINTSTORE(D->now_overhead,0);
 }
 
 #ifndef __MALLOC_HOOK_VOLATILE
@@ -178,8 +186,8 @@ void TestMallocPrivate::init()
     */
     struct mallinfo info = mallinfo();
     static TestMallocPrivate testmalloc;
-    testmalloc.now_usable = info.uordblks;
-    testmalloc.now_overhead = 0; /* cannot get this figure, but should be close to 0. */
+    QATOMICINTSTORE(testmalloc.now_usable,info.uordblks);
+    QATOMICINTSTORE(testmalloc.now_overhead,0); /* cannot get this figure, but should be close to 0. */
     TestMalloc::resetPeak();
     testmalloc.selftest();
 
@@ -207,7 +215,7 @@ void TestMallocPrivate::afterMorecore()
 
 void TestMallocPrivate::selftest()
 {
-    int before = this->now_usable;
+    int before = QATOMICINTVALUE(this->now_usable);
     int during;
     int after;
     char* array = 0;
@@ -216,10 +224,10 @@ void TestMallocPrivate::selftest()
         ba.resize(512);
         array = new char[512];
 
-        during = this->now_usable;
+        during = QATOMICINTVALUE(this->now_usable);
     }
     delete [] array;
-    after = this->now_usable;
+    after = QATOMICINTVALUE(this->now_usable);
 
     if (!(during >= before+1024)) {
         qWarning("Heap usage measurement fail: heap before byte array was %d, during was %d (expected at least %d).  Heap usage will not be measured.", before, during, before + 1024);
@@ -240,11 +248,11 @@ void TestMallocPrivate::selftest()
 
 void TestMallocPrivate::updatePeak()
 {
-    if (now_usable > peak_usable) {
-        peak_usable.fetchAndStoreOrdered(now_usable);
+    if (QATOMICINTVALUE(now_usable) > QATOMICINTVALUE(peak_usable)) {
+        peak_usable.fetchAndStoreOrdered(QATOMICINTVALUE(now_usable));
     }
-    if (now_usable + now_overhead > peak_total) {
-        peak_total.fetchAndStoreOrdered(now_usable + now_overhead);
+    if (QATOMICINTVALUE(now_usable) + QATOMICINTVALUE(now_overhead) > QATOMICINTVALUE(peak_total)) {
+        peak_total.fetchAndStoreOrdered(QATOMICINTVALUE(now_usable) + QATOMICINTVALUE(now_overhead));
     }
 }
 
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
index 1a397b11..8fcb5002 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.pro
+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 CONFIG += qtestlib unittest 
 CONFIG += qmfmessageserver qmfclient
+QT += widgets
 
 TARGET = tst_messageserver 
 target.path += $$QMF_INSTALL_ROOT/tests
diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro
index d43190de..e91f064d 100644
--- a/examples/messagingaccounts/messagingaccounts.pro
+++ b/examples/messagingaccounts/messagingaccounts.pro
@@ -3,6 +3,9 @@ TARGET = messagingaccounts
 target.path += $$QMF_INSTALL_ROOT/bin
 CONFIG += qmfclient qmfmessageserver
 
+QT += widgets
+
+
 DEPENDPATH += .
 
 QTMAIL_EXAMPLE=../qtmail
diff --git a/examples/qtmail/app/app.pro b/examples/qtmail/app/app.pro
index 055f0263..bb409bc0 100644
--- a/examples/qtmail/app/app.pro
+++ b/examples/qtmail/app/app.pro
@@ -2,6 +2,8 @@ TEMPLATE = app
 TARGET = qtmail 
 CONFIG += qmfutil qmfclient qmfmessageserver
 target.path += $$QMF_INSTALL_ROOT/bin
+QT += widgets
+
 
 DEPENDPATH += . 
 
diff --git a/examples/qtmail/libs/qmfutil/qmailcomposer.h b/examples/qtmail/libs/qmfutil/qmailcomposer.h
index 6cd45f72..fbe34b54 100644
--- a/examples/qtmail/libs/qmfutil/qmailcomposer.h
+++ b/examples/qtmail/libs/qmfutil/qmailcomposer.h
@@ -45,7 +45,6 @@
 #include <QWidget>
 #include <QList>
 #include <QString>
-#include <QIconSet>
 #include <qmailglobal.h>
 #include <qmailmessage.h>
 #include <QAction>
diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro
index 8db6a7a4..fcd69d84 100644
--- a/examples/qtmail/libs/qmfutil/qmfutil.pro
+++ b/examples/qtmail/libs/qmfutil/qmfutil.pro
@@ -7,6 +7,8 @@ target.path += $$QMF_INSTALL_ROOT/lib
 
 DEFINES += QMFUTIL_INTERNAL
 
+QT += widgets
+
 symbian: {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro
index 38a7c413..50926eaf 100644
--- a/examples/qtmail/plugins/composers/email/email.pro
+++ b/examples/qtmail/plugins/composers/email/email.pro
@@ -2,6 +2,9 @@ TEMPLATE = lib
 TARGET = emailcomposer 
 CONFIG += qmfclient qmfutil plugin
 
+QT += widgets
+
+
 target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers
 
 DEFINES += PLUGIN_INTERNAL
diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro
index 62d9ec53..9ff2e1aa 100644
--- a/examples/qtmail/plugins/viewers/generic/generic.pro
+++ b/examples/qtmail/plugins/viewers/generic/generic.pro
@@ -2,6 +2,9 @@ TEMPLATE = lib
 TARGET = genericviewer 
 CONFIG += qmfclient qmfutil plugin
 
+QT += widgets
+
+
 target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers
 
 # Use webkit to render mail if available
diff --git a/examples/serverobserver/serverobserver.pro b/examples/serverobserver/serverobserver.pro
index 4be287da..fb74fd8f 100644
--- a/examples/serverobserver/serverobserver.pro
+++ b/examples/serverobserver/serverobserver.pro
@@ -3,6 +3,9 @@ TARGET = serverobserver
 target.path += $$QMF_INSTALL_ROOT/bin
 CONFIG += qmfclient qmfmessageserver
 
+QT += widgets
+
+
 DEPENDPATH += .
 INCLUDEPATH += . ../../src/libraries/qmfclient \
                  ../../src/libraries/qmfclient/support \
diff --git a/src/libraries/qmfclient/qmfclient.pro b/src/libraries/qmfclient/qmfclient.pro
index e9b0adbc..66aa2117 100644
--- a/src/libraries/qmfclient/qmfclient.pro
+++ b/src/libraries/qmfclient/qmfclient.pro
@@ -14,6 +14,7 @@ win32: {
 }
 
 QT = core sql network
+QT += widgets
 symbian: {
     include(../../../symbianoptions.pri)
 
diff --git a/src/libraries/qmfclient/qprivateimplementation.h b/src/libraries/qmfclient/qprivateimplementation.h
index ea0d8ff7..4703f4be 100644
--- a/src/libraries/qmfclient/qprivateimplementation.h
+++ b/src/libraries/qmfclient/qprivateimplementation.h
@@ -122,7 +122,12 @@ public:
 
     inline void* detach()
     {
-        if (copy_function && self && ref_count != 1) {
+    #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+        int refcount = ref_count;
+    #else
+        int refcount = ref_count.load();
+    #endif
+        if (copy_function && self && refcount != 1) {
             void* copy = (*copy_function)(self);
             reinterpret_cast<QPrivateImplementationBase*>(copy)->self = copy;
             return copy;
diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro
index ed82c8c3..9c15add9 100644
--- a/src/libraries/qmfmessageserver/qmfmessageserver.pro
+++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro
@@ -6,6 +6,7 @@ TARGET = qmfmessageserver
 target.path += $$QMF_INSTALL_ROOT/lib
 
 QT = core network
+QT += widgets
 !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
 
 symbian: {
diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
index bb18894c..627fe439 100644
--- a/src/plugins/messageservices/imap/imap.pro
+++ b/src/plugins/messageservices/imap/imap.pro
@@ -5,6 +5,7 @@ CONFIG += qmfmessageserver qmfclient plugin
 target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
 
 QT += core network
+QT += widgets
 
 DEPENDPATH += .
 
diff --git a/src/plugins/messageservices/pop/pop.pro b/src/plugins/messageservices/pop/pop.pro
index 401fcc7d..16ef3846 100644
--- a/src/plugins/messageservices/pop/pop.pro
+++ b/src/plugins/messageservices/pop/pop.pro
@@ -5,6 +5,7 @@ CONFIG += qmfclient qmfmessageserver plugin
 target.path = $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
 
 QT = core network
+QT += widgets
 
 DEPENDPATH += .
 
diff --git a/src/plugins/messageservices/qmfsettings/qmfsettings.pro b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
index a9ed38f8..7b82e604 100644
--- a/src/plugins/messageservices/qmfsettings/qmfsettings.pro
+++ b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
@@ -5,6 +5,7 @@ CONFIG += qmfclient qmfmessageserver plugin
 target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
 
 QT = core network
+QT += widgets
 
 DEPENDPATH += .
 
diff --git a/src/plugins/messageservices/smtp/smtp.pro b/src/plugins/messageservices/smtp/smtp.pro
index 1b58bd82..8e4bfa2f 100644
--- a/src/plugins/messageservices/smtp/smtp.pro
+++ b/src/plugins/messageservices/smtp/smtp.pro
@@ -6,7 +6,7 @@ CONFIG += qmfclient qmfmessageserver plugin
 target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
 
 QT = core network
-
+QT += widgets
 DEPENDPATH += .
 
 INCLUDEPATH += . ../../../libraries/qmfclient \
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index f24d0ba6..ac8f2d72 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -12,6 +12,7 @@ SERVER_AS_DLL: {
 TARGET = messageserver
 CONFIG += qmfmessageserver qmfclient
 QT = core
+QT += widgets
 !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
 
 target.path += $$QMF_INSTALL_ROOT/bin
diff --git a/tests/tst_longstring/tst_longstring.cpp b/tests/tst_longstring/tst_longstring.cpp
index 2608bfb8..ecb7fbbd 100644
--- a/tests/tst_longstring/tst_longstring.cpp
+++ b/tests/tst_longstring/tst_longstring.cpp
@@ -75,11 +75,6 @@ private slots:
     void right();
     void mid_data();
     void mid();
-
-    void length();
-    void isEmpty();
-    void toQByteArray();
-    void dataStream();
 };
 
 QTEST_MAIN(tst_LongString)
@@ -914,24 +909,3 @@ void tst_LongString::mid()
     // Ensure that indexOf works correctly on result of mid
     verifyIndexOf( comparator, streamOutput );
 }
-
-void tst_LongString::length()
-{
-    DEPENDS_ON(mid());
-}
-
-void tst_LongString::isEmpty()
-{
-    DEPENDS_ON(mid());
-}
-
-void tst_LongString::toQByteArray()
-{
-    DEPENDS_ON(mid());
-}
-
-void tst_LongString::dataStream()
-{
-    DEPENDS_ON(mid());
-}
-