D17529: [proxysetting] Fix build with NM 1.4

Wolfgang Bauer noreply at phabricator.kde.org
Wed Dec 12 09:28:15 GMT 2018


wbauer created this revision.
Herald added a project: Frameworks.
Herald added a subscriber: kde-frameworks-devel.
wbauer requested review of this revision.

REVISION SUMMARY
  The `NMSettingProxyMethod` enum only exists since NetworkManager 1.6.
  So define it appropriately when building with a lower version (i.e. 1.4.x).

TEST PLAN
  Builds fine now with NM 1.4.x, before there were compiler errors:
  
    In file included from /home/abuild/rpmbuild/BUILD/networkmanager-qt-VERSIONgit.20181211T113515~4332597/src/settings/proxysetting.cpp:21:0:
    /home/abuild/rpmbuild/BUILD/networkmanager-qt-VERSIONgit.20181211T113515~4332597/src/settings/proxysetting.h:43:16: error: 'NM_SETTING_PROXY_METHOD_NONE' was not declared in this scope
             None = NM_SETTING_PROXY_METHOD_NONE,
                    ^
    /home/abuild/rpmbuild/BUILD/networkmanager-qt-VERSIONgit.20181211T113515~4332597/src/settings/proxysetting.h:44:16: error: 'NM_SETTING_PROXY_METHOD_AUTO' was not declared in this scope
             Auto = NM_SETTING_PROXY_METHOD_AUTO
                    ^
  
  Still compiles with newer versions, tested with 1.6.0, 1.10.6, and 1.14.4.

REPOSITORY
  R282 NetworkManagerQt

REVISION DETAIL
  https://phabricator.kde.org/D17529

AFFECTED FILES
  src/settings/proxysetting.h

To: wbauer
Cc: kde-frameworks-devel, michaelh, ngraham, bruns
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20181212/0104508b/attachment.html>


More information about the Kde-frameworks-devel mailing list