Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I97b030b0c690ec49afd59a99433293d4abee1db3

3 files changed, 13 insertions, 5 deletions

diff --git a/plugins/sizes/Sizes.cpp b/plugins/sizes/Sizes.cpp
index 2665e31c..3a646b2b 100644
--- a/plugins/sizes/Sizes.cpp
+++ b/plugins/sizes/Sizes.cpp
@@ -138,7 +138,7 @@ void Sizes::init()
 
 void Sizes::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
 {
-    Q_UNUSED(oldParent);
+    Q_UNUSED(oldParent)
     Sizes* neptune = qobject_cast<Sizes *>(newParent);
     if (neptune) {
         inheritStyle(*neptune->m_data);
@@ -170,7 +170,7 @@ qreal Sizes::scale() const
 
 void Sizes::setScale(qreal value)
 {
-    if (value == m_data->scale)
+    if (qFuzzyCompare(value, m_data->scale))
         return;
 
     m_data->scale = value;
@@ -183,7 +183,7 @@ void Sizes::propagateScale()
 {
     for (QQuickAttachedObject *child : attachedChildren()) {
         Sizes* neptune = qobject_cast<Sizes *>(child);
-        if (neptune)
+        if (neptune && !qFuzzyCompare(neptune->scale(), m_data->scale))
             neptune->setScale(m_data->scale);
     }
 }
diff --git a/plugins/systeminfo/systeminfo.cpp b/plugins/systeminfo/systeminfo.cpp
index 3560842f..8a782572 100644
--- a/plugins/systeminfo/systeminfo.cpp
+++ b/plugins/systeminfo/systeminfo.cpp
@@ -35,6 +35,7 @@
 #include <QStandardPaths>
 #include <QSysInfo>
 #include <QLibraryInfo>
+#include <QtQml/qqmlinfo.h>
 
 #include "systeminfo.h"
 
@@ -72,7 +73,14 @@ SystemInfo::~SystemInfo()
 void SystemInfo::init()
 {
     getAddress();
-    m_timerId = startTimer(1000, Qt::VeryCoarseTimer);
+    if (QSslSocket::supportsSsl()) {
+        m_timerId = startTimer(1000, Qt::VeryCoarseTimer);
+    } else {
+        updateInternetAccessStatus(false);
+        qmlWarning(this) << "SSL/TLS is not supported in this installation. HTTPS connections can't be established";
+        qmlWarning(this) << "Please verify, SSL library is installed and/or updated";
+        qmlWarning(this) << "This installation was build with: " << QSslSocket::sslLibraryBuildVersionString();
+    }
 }
 
 /*
diff --git a/plugins/systeminfo/systeminfo.h b/plugins/systeminfo/systeminfo.h
index 1451af52..97eb0e61 100644
--- a/plugins/systeminfo/systeminfo.h
+++ b/plugins/systeminfo/systeminfo.h
@@ -91,7 +91,7 @@ private:
     void getAddress();
     void getQtDiagInfo();
     QStringList m_addressList;
-    int m_timerId;
+    int m_timerId{0};
     bool m_connected{false};
     bool m_internetAccess{false};
     QString m_qtDiagContents;