----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/123091/ -----------------------------------------------------------
(Updated March 21, 2015, 2:16 a.m.) Review request for Plasma, Martin Gräßlin and Jan Grulich. Changes ------- Fix build for the plasma-geolocation-ip module also Repository: plasma-workspace Description ------- Fix build by adding QT_NO_KEYWORDS definition. Also adjusted the surrounding files to make them build with this. It is needed to avoid symbol collision with gtk/gio. (I have no idea what changed in NM 1.0.0 that is exposes the failure, it builds fine with older versions - but would like to know if there's a better solution ;-) Diffs (updated) ----- dataengines/geolocation/CMakeLists.txt 7a477c1 dataengines/geolocation/geolocation.cpp 678f25f dataengines/geolocation/geolocationprovider.cpp 6db8026 Diff: https://git.reviewboard.kde.org/r/123091/diff/ Testing ------- The error was: ``` In file included from /usr/include/qt5/QtCore/qobject.h:40:0, from /usr/include/qt5/QtCore/qtimer.h:42, from /usr/include/qt5/QtCore/QTimer:1, from ../dataengines/geolocation/geolocation.h:21, from ../dataengines/geolocation/geolocation.cpp:18: /usr/include/glib-2.0/gio/gdbusintrospection.h:155:25: error: expected unqualified-id before ‘public’ GDBusSignalInfo **signals; ^ In file included from /usr/include/glib-2.0/gio/gio.h:53:0, from /usr/include/libnm/nm-types.h:24, from /usr/include/libnm/nm-object.h:29, from /usr/include/libnm/nm-access-point.h:29, from /usr/include/libnm/NetworkManager.h:26, from /usr/include/KF5/NetworkManagerQt/ipconfig.h:34, from /usr/include/KF5/NetworkManagerQt/device.h:33, from /usr/include/KF5/NetworkManagerQt/manager.h:31, from /usr/include/KF5/NetworkManagerQt/Manager:1, from ../dataengines/geolocation/geolocation.cpp:25: /usr/include/glib-2.0/gio/gdbusintrospection.h:155:24: error: expected ‘;’ at end of member declaration GDBusSignalInfo **signals; ^ /usr/include/glib-2.0/gio/gdbusintrospection.h:155:32: error: expected ‘:’ before ‘;’ token GDBusSignalInfo **signals; ``` With the attached patch it builds fine. Thanks, Hrvoje Senjan
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
