diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-17 15:52:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 09:58:23 +0100 |
| commit | e8b4c49efddb87f4195c74668b5026119eccea56 (patch) | |
| tree | 973f4539844b7ff0797bf7b7b1383c853dffda99 /tests/auto/dbus | |
| parent | ed5583048ecf3d340ded7e4d5f1b926a9929eebd (diff) | |
qtbase tests: Fix some warnings
- Fix warnings about QAtomicPointer/Int usage
- Fix some gcc 4.6 warnings about assigned/unused variables
Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index 6490bfe973..f8f632d667 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -1107,7 +1107,7 @@ class VirtualObject: public QDBusVirtualObject public: VirtualObject() :success(true) {} - QString introspect(const QString &path) const + QString introspect(const QString & /* path */) const { return QString(); } diff --git a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp index e37e4c3ae7..32ede6c97f 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -211,8 +211,8 @@ tst_QDBusThreading::tst_QDBusThreading() void tst_QDBusThreading::joinThreads() { - threadJoin.acquire(threadJoinCount); - threadJoinCount = 0; + threadJoin.acquire(threadJoinCount.load()); + threadJoinCount.store(0); } bool tst_QDBusThreading::waitForSignal(QObject *obj, const char *signal, int delay) |