diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 13:01:20 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 13:09:29 +0200 |
commit | 576a8e152ec36e7465bfdc8ad63998cffbab4091 (patch) | |
tree | 07472de61c7542a90f675869e480b99076c5b439 /tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp | |
parent | fb7f30d2bad0c84ffea4db862a71ba2e03d855d0 (diff) | |
parent | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (diff) |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp')
-rw-r--r-- | tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp index bc06f8e377..3ec9e636a8 100644 --- a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp +++ b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp @@ -41,13 +41,13 @@ #include <QtDBus> #include <QtTest> -const char errorName[] = "com.trolltech.tst_QDBusContext.Error"; +const char errorName[] = "org.qtproject.tst_QDBusContext.Error"; const char errorMsg[] = "A generic error"; class TestObject: public QObject, protected QDBusContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.tst_QDBusContext.TestObject") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.tst_QDBusContext.TestObject") public: inline TestObject(QObject *parent) : QObject(parent) { } public Q_SLOTS: |