Diffusion Plasma Network Management Applet 298d466dc1e0

fixed merge
298d466dc1e0
Actions

Authored by mkacej on May 11 2018, 11:11 PM.

Description

fixed merge

Details

Committed

mkacej

May 11 2018, 11:11 PM

Parents

R116:b96bfc94bc4c: Better naming and minor coding style fixes
R116:58485bd221e8: mobile networks further basic interface

Branches

Unknown

Tags

Unknown

mkacej committed R116:298d466dc1e0: fixed merge (authored by mkacej).May 11 2018, 11:11 PM

Merged Changes

	Commit			Author	Details	Committed
	b96bfc94bc4c			jgrulich	Better naming and minor coding style fixes	May 9 2018

Changes (58)

		Path
M		CMakeLists.txt
P		mobile/CMakeLists.txt Copied to mobile/wifi/CMakeLists.txt
A	(dir)	mobile/broadband/
A		mobile/broadband/CMakeLists.txt
V		{mobile/broadband/mobilebroadbandsettings.cpp ← mobile_cellular/celluralsettings.cpp}
V		{mobile/broadband/mobilebroadbandsettings.desktop ← mobile_cellular/mobile_cellural.desktop}
V		{mobile/broadband/mobilebroadbandsettings.h ← mobile_cellular/celluralsettings.h}
A	(dir)	mobile/broadband/package/
A	(dir)	mobile/broadband/package/contents/
A	(dir)	mobile/broadband/package/contents/ui/
V		{mobile/broadband ← mobile_cellular}/package/contents/ui/MobileSettings.qml
V		{mobile/broadband/package/contents/ui/main.qml ← mobile_cellular/package/contents/ui/mainMobile.qml}
V		{mobile/broadband ← mobile_cellular}/package/metadata.desktop
D		mobile/package
D		mobile/package/contents
D		mobile/package/contents/ui
V		mobile/{ → wifi}/package/contents/ui/ConnectionEditor.qml
V		mobile/{ → wifi}/package/contents/ui/ConnectionItemDelegate.qml
V		mobile/{package/contents/ui/IpSetting.qml → wifi/package/contents/ui/IPAddressSetting.qml}
V		mobile/{ → wifi}/package/contents/ui/NetworkListView.qml
V		mobile/{ → wifi}/package/contents/ui/NetworkSettings.qml
V		mobile/{ → wifi}/package/contents/ui/PasswordField.qml
V		mobile/{package/contents/ui/TetheringSettings.qml → wifi/package/contents/ui/TetheringSetting.qml}
V		mobile/{ → wifi}/package/contents/ui/WirelessSecuritySetting.qml
V		mobile/{package/contents/ui/mainWifi.qml → wifi/package/contents/ui/main.qml}
V		mobile/{ → wifi}/package/metadata.desktop
A	(dir)	mobile/wifi/
P		mobile/wifi/CMakeLists.txt Copied from mobile/CMakeLists.txt
A	(dir)	mobile/wifi/package/
A	(dir)	mobile/wifi/package/contents/
A	(dir)	mobile/wifi/package/contents/ui/
V		mobile/{wifi ← }/package/contents/ui/ConnectionEditor.qml
V		mobile/{wifi ← }/package/contents/ui/ConnectionItemDelegate.qml
V		mobile/{wifi/package/contents/ui/IPAddressSetting.qml ← package/contents/ui/IpSetting.qml}
V		mobile/{wifi ← }/package/contents/ui/NetworkListView.qml
V		mobile/{wifi ← }/package/contents/ui/NetworkSettings.qml
V		mobile/{wifi ← }/package/contents/ui/PasswordField.qml
V		mobile/{wifi/package/contents/ui/TetheringSetting.qml ← package/contents/ui/TetheringSettings.qml}
V		mobile/{wifi ← }/package/contents/ui/WirelessSecuritySetting.qml
V		mobile/{wifi/package/contents/ui/main.qml ← package/contents/ui/mainWifi.qml}
V		mobile/{wifi ← }/package/metadata.desktop
V		mobile/{wifi ← }/wifisettings.cpp
V		mobile/{wifi ← }/wifisettings.desktop
V		mobile/{wifi ← }/wifisettings.h
V		mobile/{ → wifi}/wifisettings.cpp
V		mobile/{ → wifi}/wifisettings.desktop
V		mobile/{ → wifi}/wifisettings.h
D		mobile_cellular
D		mobile_cellular/CMakeLists.txt
V		{mobile_cellular/celluralsettings.cpp → mobile/broadband/mobilebroadbandsettings.cpp}
V		{mobile_cellular/celluralsettings.h → mobile/broadband/mobilebroadbandsettings.h}
V		{mobile_cellular/mobile_cellural.desktop → mobile/broadband/mobilebroadbandsettings.desktop}
D		mobile_cellular/package
D		mobile_cellular/package/contents
D		mobile_cellular/package/contents/ui
V		{mobile_cellular → mobile/broadband}/package/contents/ui/MobileSettings.qml
V		{mobile_cellular/package/contents/ui/mainMobile.qml → mobile/broadband/package/contents/ui/main.qml}
V		{mobile_cellular → mobile/broadband}/package/metadata.desktop