diff options
| author | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-13 17:36:03 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-13 17:36:03 +0000 |
| commit | 9e4fdb61fe4a3b2b97460a1d3dd969c153e932a9 (patch) | |
| tree | 54574e57c6099e333efc84767ced5f16647e62cf | |
| parent | 59454af9a31f9ee0ae6f2f351c29140fbdda6591 (diff) | |
* qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.
Patch by Stefan Eilers. (r529537)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | qt/qdbusintegrator.cpp | 4 |
2 files changed, 9 insertions, 4 deletions
@@ -1,9 +1,14 @@ -2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com +2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com> + + * qt/qdbusintegrator.cpp: Work around g++ 3.3 bug. + Patch by Stefan Eilers. (r529537) + +2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com> * qt/qdbusinternalfilters.cpp: Don't show the parent's contents (r528208) -2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com +2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com> * qt/Makefile.am: fix the dependency for qdbusconnection_p.moc. It's included in qdbusintegrator.cpp, diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index a9467c0..4a72d19 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -1221,12 +1221,12 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc) //qDebug("base service: %s", service); } -extern "C" +extern "C"{ static void qDBusResultReceived(DBusPendingCall *pending, void *user_data) { QDBusConnectionPrivate::messageResultReceived(pending, user_data); } - +} void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data) { QDBusPendingCall *call = reinterpret_cast<QDBusPendingCall *>(user_data); |