On 1 September 2017 at 12:39, Jan Grulich <jgrul...@redhat.com> wrote: > Hi, > > On pátek 1. září 2017 12:46:54 CEST Shaheed Haque wrote: >> Hi all, >> >> The Python bindings effort recently ran into the need for >> https://phabricator.kde.org/D5185 to prevent clashes between Qt's use >> of "signals" and libnm via networkmanager-qt's ipconfig.h. However, it >> seems to me that the fix is incomplete in current Git master as there >> are at least two other files which also include NetworkManager.h: >> >> https://cgit.kde.org/networkmanager-qt.git/tree/src/settings/setting.h >> https://cgit.kde.org/networkmanager-qt.git/tree/src/settings/connectionsetti >> ngs.h > > Both do seem to have the fix, or what is the problem?
Apologies, you are absolutely right. I must have been looking not-where-I-thought-I-was. Sorry for the noise, Shaheed > >> AFAICS, the first, setting.h, definitely needs the fix (it could also >> do with a sync up of the version checking around the #include to match >> ipconfig.h). The second, connectionsettings.h actually #includes >> setting.h, so it might be able to lose the #include of NetworkManager >> entirely, else it should likely also get the fixes? >> >> Assuming this makes sense, it would be good if somebody else can >> kindly drive the patching as my KDE build/setup/knowledge is very, >> VERY rusty. >> >> Thanks, Shaheed >> >> P.S. Please CC me as I'm not subscribed here. > > Regards, > Jan >
