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/qdbuspendingcall/tst_qdbuspendingcall.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/qdbuspendingcall/tst_qdbuspendingcall.cpp')
| -rw-r--r-- | tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 60a8061ae4..eca352456f 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -46,12 +46,12 @@ #include <QtTest/QtTest> #include <QtDBus> -#define TEST_INTERFACE_NAME "com.trolltech.QtDBus.MyObject" +#define TEST_INTERFACE_NAME "org.qtproject.QtDBus.MyObject" class MyObject : public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.MyObject") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.QtDBus.MyObject") public: MyObject(QObject* parent =0) |