diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-29 11:11:03 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 00:07:39 +0200 |
| commit | e02a144a3c8e7858d879ac2d0038bc7d00906ae6 (patch) | |
| tree | 3d44c764483a4035bb3310d4a1ba8153a4cdead1 /tests/auto/dbus/qdbuspendingreply | |
| parent | 65e75acd05b16fea11d85f3a6a330d50c8ce7c5d (diff) | |
Finish cleaning up com.trolltech -> org.qtproject in QtDBus
Lots of uses of the annotations and error names, plus a bunch of local
unit test names (including one file that had to be renamed).
The meta object generator is updated to support both the old and new
names. That means some references to com.trolltech *must* remain in the
source code.
Task-number: QTBUG-23274
Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'tests/auto/dbus/qdbuspendingreply')
| -rw-r--r-- | tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp index 865c9a86ff..6d5bdf7ba6 100644 --- a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp +++ b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp @@ -106,7 +106,7 @@ private slots: class TypesInterface: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.Qt.Autotests.TypesInterface") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.Qt.Autotests.TypesInterface") public: TypesInterface(QObject *parent) : QDBusAbstractAdaptor(parent) @@ -241,7 +241,7 @@ tst_QDBusPendingReply::tst_QDBusPendingReply() QDBusConnection::sessionBus().registerObject("/", this); iface = new QDBusInterface(QDBusConnection::sessionBus().baseService(), "/", - "com.trolltech.Qt.Autotests.TypesInterface", + "org.qtproject.Qt.Autotests.TypesInterface", QDBusConnection::sessionBus(), this); } |