diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| -rw-r--r-- | src/doc/qtdeviceutilities-project.qdocconf | 4 | ||||
| -rw-r--r-- | src/doc/src/external-resources.qdoc | 4 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 43 |
5 files changed, 36 insertions, 25 deletions
diff --git a/.cmake.conf b/.cmake.conf index 1b3f42e..55ff681 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.4") +set(QT_REPO_MODULE_VERSION "6.2.8") diff --git a/dependencies.yaml b/dependencies.yaml index 932395e..0431c6a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: - ../../qt/qtdeclarative: - ref: 62c6002129f2dc9c72c6308cfdfbebe914751fbe + ../../qt/tqtc-qtdeclarative: + ref: 9919f58fce6329a233ca885188d0aba5f484e546 required: true - ../qttools: - ref: 67109a3327c11872e70d18b4f53ad8df270527ab + ../tqtc-qttools: + ref: 2819de71fc973e79aa9b1e44716636ab194108b1 required: false diff --git a/src/doc/qtdeviceutilities-project.qdocconf b/src/doc/qtdeviceutilities-project.qdocconf index 01b1c96..2868e1e 100644 --- a/src/doc/qtdeviceutilities-project.qdocconf +++ b/src/doc/qtdeviceutilities-project.qdocconf @@ -53,8 +53,8 @@ macro.B2QA = "\\e {Boot to Qt for embedded Android}" macro.B2QL = "\\e {Boot to Qt for embedded Linux}" macro.QtDU = "Qt Device Utilities" -# Keep Device Creation as the landing page -navigation.landingpage = "Qt for Device Creation" +# Qt Device Utilities as the landing page +navigation.landingpage = "Qt Device Utilities" navigation.qmltypespage = "Qt Device Utilities QML Types" navigation.cppclassespage = "Qt Device Utilities C++ Classes" diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc index 38e9654..9b6feb0 100644 --- a/src/doc/src/external-resources.qdoc +++ b/src/doc/src/external-resources.qdoc @@ -24,10 +24,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/*! - \externalpage https://doc.qt.io/QtForDeviceCreation - \title Qt for Device Creation -*/ /*! \externalpage http://code.qt.io/cgit/qt/qtdeviceutilities.git/ diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 9a812d1..77bf66f 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -181,20 +181,23 @@ void QNetworkSettingsManagerPrivate::onTechnologyAdded(const QDBusObjectPath &te Q_Q(QNetworkSettingsManager); foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { - ConnmanSettingsInterface* tech = qobject_cast<ConnmanSettingsInterface*>(item); - if (tech->path() != technology.path()) { - ConnmanSettingsInterface *interface = new ConnmanSettingsInterface(technology.path(), properties, this); - interface->scanServices(); - - if (interface->type() == QNetworkSettingsType::Wired) { - m_interfaceModel.insert(0, interface); - } - else if (interface->type() == QNetworkSettingsType::Wifi) { - m_interfaceModel.append(interface); - } - emit q->interfacesChanged(); + ConnmanSettingsInterface* interface = qobject_cast<ConnmanSettingsInterface*>(item); + if (interface->path() == technology.path()) { + return; // we already know the interface/technology } } + + ConnmanSettingsInterface *interface = new ConnmanSettingsInterface(technology.path(), properties, this); + interface->scanServices(); + + if (interface->type() == QNetworkSettingsType::Wired) { + m_interfaceModel.insert(0, interface); + } + else if (interface->type() == QNetworkSettingsType::Wifi) { + m_interfaceModel.append(interface); + } + + emit q->interfacesChanged(); } void QNetworkSettingsManagerPrivate::onTechnologyRemoved(const QDBusObjectPath &technology) @@ -257,9 +260,21 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan emit q->servicesChanged(); if (auto service = m_unnamedServices.take(path)) - service->deleteLater(); + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + service->deleteLater(); + } if (auto service = m_unknownServices.take(path)) - service->deleteLater(); + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + service->deleteLater(); + } m_unnamedServicesForSsidConnection.remove(path); // do not delete here } |