Merge lp://staging/~pete-woods/indicator-network/cmake-extras-compatibility into lp://staging/indicator-network
Proposed by
Pete Woods
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~pete-woods/indicator-network/cmake-extras-compatibility | ||||
| Merge into: | lp://staging/indicator-network | ||||
| Diff against target: |
4240 lines (+2705/-334) 63 files modified
CMakeLists.txt (+2/-2) data/nm-device-ethernet.xml (+51/-0) debian/changelog (+9/-0) debian/control (+4/-4) debian/rules (+2/-9) doc/qt/cpp/CMakeLists.txt (+1/-1) po/indicator-network.pot (+152/-116) src/connectivity-api/connectivity-qml/CMakeLists.txt (+1/-2) src/indicator/CMakeLists.txt (+7/-0) src/indicator/factory.cpp (+6/-0) src/indicator/factory.h (+4/-1) src/indicator/icons.cpp (+21/-0) src/indicator/icons.h (+2/-0) src/indicator/menu-builder.cpp (+11/-4) src/indicator/menuitems/ethernet-connection-item.cpp (+73/-0) src/indicator/menuitems/ethernet-connection-item.h (+46/-0) src/indicator/menuitems/ethernet-item.cpp (+103/-0) src/indicator/menuitems/ethernet-item.h (+54/-0) src/indicator/menuitems/ethernet-link-item.cpp (+109/-0) src/indicator/menuitems/ethernet-link-item.h (+40/-0) src/indicator/menuitems/section.h (+2/-0) src/indicator/menuitems/wifi-link-item.cpp (+3/-3) src/indicator/menuitems/wifi-link-item.h (+1/-1) src/indicator/menuitems/wwan-link-item.h (+2/-1) src/indicator/nmofono/connection/active-connection-manager.cpp (+5/-0) src/indicator/nmofono/connection/active-connection-manager.h (+3/-0) src/indicator/nmofono/connection/active-connection.cpp (+31/-0) src/indicator/nmofono/connection/active-connection.h (+6/-0) src/indicator/nmofono/connection/available-connection.cpp (+96/-0) src/indicator/nmofono/connection/available-connection.h (+68/-0) src/indicator/nmofono/ethernet/ethernet-link.cpp (+379/-0) src/indicator/nmofono/ethernet/ethernet-link.h (+93/-0) src/indicator/nmofono/link.h (+8/-2) src/indicator/nmofono/manager-impl.cpp (+67/-36) src/indicator/nmofono/manager-impl.h (+5/-2) src/indicator/nmofono/manager.h (+7/-4) src/indicator/nmofono/nm-device-statistics-monitor.cpp (+4/-29) src/indicator/nmofono/nm-device-statistics-monitor.h (+1/-1) src/indicator/nmofono/wifi/wifi-link-impl.cpp (+19/-20) src/indicator/nmofono/wifi/wifi-link-impl.h (+3/-1) src/indicator/nmofono/wifi/wifi-link.h (+2/-1) src/indicator/root-state.cpp (+16/-0) src/indicator/sections/ethernet-link-section.cpp (+211/-0) src/indicator/sections/ethernet-link-section.h (+45/-0) src/indicator/sections/ethernet-section.cpp (+140/-0) src/indicator/sections/ethernet-section.h (+44/-0) src/indicator/sections/quick-access-section.h (+2/-1) src/indicator/sections/vpn-section.cpp (+0/-1) src/indicator/sections/wifi-section.cpp (+76/-40) src/indicator/sections/wifi-section.h (+2/-1) src/indicator/sections/wwan-section.cpp (+2/-2) src/indicator/sections/wwan-section.h (+2/-1) src/menumodel-cpp/menu-item.cpp (+12/-0) src/menumodel-cpp/menu-item.h (+2/-0) src/menumodel-cpp/menu.cpp (+5/-0) src/menumodel-cpp/menu.h (+2/-0) src/qdbus-stubs/CMakeLists.txt (+7/-0) tests/data/networkmanager.py (+103/-28) tests/integration/CMakeLists.txt (+0/-3) tests/integration/indicator-network-test-base.cpp (+74/-7) tests/integration/indicator-network-test-base.h (+18/-1) tests/integration/test-connectivity-api-sim.cpp (+1/-1) tests/integration/test-indicator.cpp (+438/-8) |
||||
| To merge this branch: | bzr merge lp://staging/~pete-woods/indicator-network/cmake-extras-compatibility | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Compatibility with unversioned cmake-extras modules
Description of the change
Compatibility with unversioned cmake-extras modules
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
