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-20 18:32:24 +0200 |
| commit | 2a392118dae5169de8a5b1eacfd02d02e5dda7be (patch) | |
| tree | 750ac859b42e2636702c6014839764a8b6849910 /src/dbus/qdbusmisc.cpp | |
| parent | 8599a0e6397391634ee52197e164f6b7121f9a4d (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>
(cherry-picked from commit e02a144a3c8e7858d879ac2d0038bc7d00906ae6)
Diffstat (limited to 'src/dbus/qdbusmisc.cpp')
| -rw-r--r-- | src/dbus/qdbusmisc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index e7c7715eaa..610320387d 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -89,11 +89,11 @@ QString qDBusInterfaceFromMetaObject(const QMetaObject *mo) interface.replace(QLatin1String("::"), QLatin1String(".")); if (interface.startsWith(QLatin1String("QDBus"))) { - interface.prepend(QLatin1String("com.trolltech.QtDBus.")); + interface.prepend(QLatin1String("org.qtproject.QtDBus.")); } else if (interface.startsWith(QLatin1Char('Q')) && interface.length() >= 2 && interface.at(1).isUpper()) { // assume it's Qt - interface.prepend(QLatin1String("com.trolltech.Qt.")); + interface.prepend(QLatin1String("org.qtproject.Qt.")); } else if (!QCoreApplication::instance()|| QCoreApplication::instance()->applicationName().isEmpty()) { interface.prepend(QLatin1String("local.")); |