diff options
| author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-16 15:21:23 +0200 |
|---|---|---|
| committer | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-21 10:33:50 +0200 |
| commit | a1df8e45166f15ed77e2ef8b3ad6757299662dc7 (patch) | |
| tree | 96d355ea2e3cd6cdac0ada865e85130c0adeae6d /src/networksettings | |
| parent | aa9223a4d7d410aa8a12495fef5c3f36a2c79ffe (diff) | |
Modify settingsui to work against Qt 6
Following modules are removed in Qt 6
- XmlListModel
- QtGraphicalEffects
Adapt settingsui to work without them.
Also remove needless resources and make miscallaneous improvements.
Task-number: QTBUG-89065
Change-Id: Ie66d73e4d8f9c1dd4cbec2fe5f9f71f32f7d1bdf
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/networksettings')
| -rw-r--r-- | src/networksettings/connman.pri | 1 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 3 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/networksettings/connman.pri b/src/networksettings/connman.pri index 3f92830..957f2f0 100644 --- a/src/networksettings/connman.pri +++ b/src/networksettings/connman.pri @@ -1,7 +1,6 @@ QT += core network dbus INCLUDEPATH += $${PWD}/connman -DEFINES += QMAKE_BUILD DBUS_INTERFACES = \ connman/connman_manager.xml \ diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 7c65018..3f594bd 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -34,9 +34,6 @@ #include "qnetworksettingsservicemodel.h" #include "qnetworksettingsuseragent.h" #include "moc_connman_manager_interface.cpp" -#ifdef QMAKE_BUILD -#include "connman_manager_interface.cpp" -#endif QT_BEGIN_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index c199621..c696cdd 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -46,9 +46,8 @@ #include "connmancommon.h" #include "qnetworksettingsmanager.h" #include "qnetworksettingsinterfacemodel.h" +#include "connman_manager_interface.h" -// Automatically generated class in global namespace -class NetConnmanManagerInterface; QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) |