Merge remote-tracking branch 'origin/5.7' into 5.8

* origin/5.7:
  Rename main project file to match project name
  Fix compile error in qtdevicesettings
  Fix QNetworkSettingsManager usage from the C++
  Fix Wifi utils connection view
  Make bluetooth support optional
  Fix typo
  Remove unneeded include
  Use new style signals and slots connection
  Fix uninitialized variables
  Fix unused variable warning
  Fix deprecated QString warning
  Qt does not name getter functions with 'get'
  Fix compile errors: declaration of ‘<X>’ shadows a member of 'this'
  Fix compile error: No Qt keywords allowed in header files
  Fix compile error: 0 is not allowed for pointer initialization anymore

Conflicts:
	src/bluetoothsettings/bluetoothdevice.h
	src/bluetoothsettings/bluez/bluetoothdevice_p.h
	src/bluetoothsettings/discoverymodel.h
	src/displaysettings/displaysettings.h
	src/displaysettings/displaysettings_p.h
	src/localdevice/qlocaldevice.h
	src/localesettings/localemodel.h
	src/localesettings/systemlocale.h
	src/networksettings/connman/qnetworksettingsinterface_p.h
	src/networksettings/connman/qnetworksettingsservice_p.h
	src/networksettings/connman/qnetworksettingsuseragent_p.h
	src/networksettings/qnetworksettings.h
	src/networksettings/qnetworksettingsaddressmodel.h
	src/networksettings/qnetworksettingsinterface.h
	src/networksettings/qnetworksettingsinterfacemodel.h
	src/networksettings/qnetworksettingsmanager.h
	src/networksettings/qnetworksettingsservice.h
	src/networksettings/qnetworksettingsservicemodel.h
	src/networksettings/qnetworksettingsuseragent.h
	src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
	src/timedatesettings/systemtime.h
	src/timedatesettings/timezonemodel.h

Change-Id: I7db3a24e41718e5951ec33336a1a4bd08b33e823

3 files changed, 5 insertions, 4 deletions

diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h
index 61a42c4..4fb00a0 100644
--- a/src/localesettings/localemodel.h
+++ b/src/localesettings/localemodel.h
@@ -41,7 +41,7 @@ class LocaleItem : public QObject
     Q_PROPERTY(QString country READ country CONSTANT)
     Q_PROPERTY(QString language READ language CONSTANT)
 public:
-    explicit LocaleItem(const QLocale &locale, QObject *parent = nullptr);
+    explicit LocaleItem(const QLocale &locale, QObject *parent = Q_NULLPTR);
     QString country() const;
     QString language() const;
     QString code() const;
@@ -57,7 +57,7 @@ class Q_DECL_EXPORT LocaleModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    explicit LocaleModel(QObject *parent = nullptr);
+    explicit LocaleModel(QObject *parent = Q_NULLPTR);
     virtual ~LocaleModel();
     // from QAbstractItemModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h
index e942974..075d397 100644
--- a/src/localesettings/systemlocale.h
+++ b/src/localesettings/systemlocale.h
@@ -38,11 +38,12 @@ class Q_DECL_EXPORT SystemLocale : public QObject
     Q_OBJECT
     Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged)
 public:
-    explicit SystemLocale(QObject *parent = nullptr);
+    explicit SystemLocale(QObject *parent = Q_NULLPTR);
     QString locale() const;
     void setLocale(const QString& aLocale);
 Q_SIGNALS:
     void localeChanged();
+public Q_SLOTS:
 
 protected:
     SystemLocalePrivate *d_ptr;
diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h
index f5caed9..761c5cd 100644
--- a/src/localesettings/systemlocale_p.h
+++ b/src/localesettings/systemlocale_p.h
@@ -64,7 +64,7 @@ public:
         QStringList newLocale;
         QMap<QString, QString>::iterator i;
         for (i = m_localeCache.begin(); i != m_localeCache.end(); ++i) {
-            QString val = i.key() + "=" + i.value();
+            QString val = i.key() + QLatin1String("=") + i.value();
             newLocale.append(val);
         }
         m_localeInterface->SetLocale(newLocale, true);