diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2011-12-31 20:38:12 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 17:55:55 (GMT) |
| commit | 71e88ddd54bd869271cdf37c349c1ad26d1c4b7c (patch) | |
| tree | ed62bbe376dec2683de57e05b3383601e07bcd07 /src/dbus | |
| parent | 798a479a956954794e7afff38822fd0205fec859 (diff) | |
| download | Qt-71e88ddd54bd869271cdf37c349c1ad26d1c4b7c.zip Qt-71e88ddd54bd869271cdf37c349c1ad26d1c4b7c.tar.gz Qt-71e88ddd54bd869271cdf37c349c1ad26d1c4b7c.tar.bz2 | |
Remove implicit const char*->QString cast from QDBusServer's constructor
Commit 5be6cf0a6e306ed3a51ed5ba89317b1317544eea introduced an implicit
cast from const char* to QString in QDBusServer's constructor, which
breaks the compilation of applications which use QtDBus when
QT_NO_CAST_FROM_ASCII is defined and clang is used.
Task-number: QTBUG-23398
Change-Id: Iaba66ab05ae6232f69a3981c2ca168f1ffd7bb05
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusserver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index 900c652..f4f19f8 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -61,7 +61,7 @@ class Q_DBUS_EXPORT QDBusServer: public QObject { Q_OBJECT public: - QDBusServer(const QString &address = "unix:tmpdir=/tmp", QObject *parent = 0); + QDBusServer(const QString &address = QLatin1String("unix:tmpdir=/tmp"), QObject *parent = 0); virtual ~QDBusServer(); bool isConnected() const; |