Replace com.trolltech with org.qtproject in D-Bus's performance tests

I had missed these, apparently.

Task-number: QTBUG-23274
Change-Id: I6455dc34b18ec9cefccfe527b3fd3ad34fb61aa3
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>

diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
index 765852c..556de71 100644 (file)
--- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp
@@ -43,7 +43,7 @@
 
 #include "../serverobject.h"
 
-static const char serviceName[] = "com.trolltech.autotests.performance";
+static const char serviceName[] = "org.qtproject.autotests.performance";
 static const char objectPath[] = "/";
 
 int main(int argc, char *argv[])

diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h
index bc173aa..857f31f 100644 (file)
--- a/tests/benchmarks/dbus/qdbusperformance/serverobject.h
+++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h
@@ -49,7 +49,7 @@
 class ServerObject: public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "com.trolltech.autotests.Performance")
+    Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.Performance")
 public:
     ServerObject(const QString &objectPath, QDBusConnection conn, QObject *parent = 0)
         : QObject(parent)

diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
index bd7f09d..e93a101 100644 (file)
--- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -44,7 +44,7 @@
 
 #include "./serverobject.h"
 
-static const char serviceName[] = "com.trolltech.autotests.performance";
+static const char serviceName[] = "org.qtproject.autotests.performance";
 static const int runTime = 500;
 
 class tst_QDBusPerformance: public QObject
@@ -98,11 +98,11 @@ void tst_QDBusPerformance::initTestCase()
     QTestEventLoop::instance().enterLoop(5);
     QVERIFY(con.interface()->isServiceRegistered(serviceName));
 
-    remote = new QDBusInterface(serviceName, "/", "com.trolltech.autotests.Performance", con, this);
+    remote = new QDBusInterface(serviceName, "/", "org.qtproject.autotests.Performance", con, this);
     QVERIFY(remote->isValid());
 
     new ServerObject("/", con, this);
-    local = new QDBusInterface(con.baseService(), "/", "com.trolltech.autotests.Performance", con, this);
+    local = new QDBusInterface(con.baseService(), "/", "org.qtproject.autotests.Performance", con, this);
     QVERIFY(local->isValid());
 }