2 files changed, 16 insertions, 22 deletions
diff --git a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
index 7b5f867798..ddfe3008a5 100644
--- a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
+++ b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
@@ -2,4 +2,3 @@ CONFIG += testcase
 TARGET = tst_qdbuspendingcall
 QT = core dbus testlib
 SOURCES += tst_qdbuspendingcall.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
index cc12ef8bcc..f42c58ba7f 100644
--- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
+++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
@@ -1,32 +1,27 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2015 Intel Corporation.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -178,7 +173,7 @@ void tst_QDBusPendingCall::waitForFinished()
     QVERIFY(!ac.isError());
 
     const QDBusMessage reply = ac.reply();
-    QVERIFY(reply.type() == QDBusMessage::ReplyMessage);
+    QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
     QCOMPARE(reply.signature(), QString("as"));
 
     const QVariantList args = ac.reply().arguments();
@@ -334,7 +329,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded()
             QDBusPendingCall ac = tst->sendMessage();
 //            QVERIFY(!ac.isFinished());
 //            QVERIFY(!ac.isError());
-//            QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage);
+//            QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
 
             QDBusPendingCallWatcher watch(ac);
             tst->connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -344,7 +339,7 @@ void tst_QDBusPendingCall::watcher_waitForFinished_threaded()
 
 //            QVERIFY(!ac.isFinished());
 //            QVERIFY(!ac.isError());
-//            QVERIFY(ac.reply().type() == QDBusMessage::InvalidMessage);
+//            QCOMPARE(ac.reply().type(), QDBusMessage::InvalidMessage);
             QCOMPARE(tst->callCount, 0);
             QCOMPARE(tst->slotCalled, 0);