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

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

4 files changed, 8 insertions, 10 deletions

diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
index e3b1c6c37d..51c690d43a 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
@@ -58,8 +58,8 @@ QDBusPlatformMenuItem::QDBusPlatformMenuItem()
     , m_isSeparator(false)
     , m_isCheckable(false)
     , m_isChecked(false)
-    , m_dbusID(nextDBusID++)
     , m_hasExclusiveGroup(false)
+    , m_dbusID(nextDBusID++)
 {
     menuItemsByID.insert(m_dbusID, this);
 }
@@ -164,7 +164,6 @@ QList<const QDBusPlatformMenuItem *> QDBusPlatformMenuItem::byIds(const QList<in
 QDBusPlatformMenu::QDBusPlatformMenu()
     : m_isEnabled(true)
     , m_isVisible(true)
-    , m_isSeparator(false)
     , m_revision(1)
     , m_containingMenuItem(Q_NULLPTR)
 {
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
index 668195a794..5458e2fdd5 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
@@ -120,9 +120,9 @@ private:
     bool m_isSeparator : 1;
     bool m_isCheckable : 1;
     bool m_isChecked : 1;
-    int m_dbusID : 16;
     bool m_hasExclusiveGroup : 1;
-    int m_reserved : 6;
+    short /*unused*/ : 6;
+    short m_dbusID : 16;
     QKeySequence m_shortcut;
 };
 
@@ -177,7 +177,6 @@ private:
     QIcon m_icon;
     bool m_isEnabled;
     bool m_isVisible;
-    bool m_isSeparator;
     uint m_revision;
     QHash<quintptr, QDBusPlatformMenuItem *> m_itemsByTag;
     QList<QDBusPlatformMenuItem *> m_items;
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
index ff1a7ae532..4c9bc8f7e3 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
@@ -159,8 +159,6 @@ private:
     QTemporaryFile *m_tempAttentionIcon;
     QString m_attentionIconName;
     QTimer m_attentionTimer;
-    bool m_isRequestingAttention;
-    bool m_hasMenu;
     bool m_registered;
 };
 
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index 93c7b0871c..30efa12124 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -816,11 +816,13 @@ QStringList QGenericUnixTheme::themeNames()
                 result.push_back(QStringLiteral("gtk3"));
                 // fallback to the generic Gnome theme if loading the GTK3 theme fails
                 result.push_back(QLatin1String(QGnomeTheme::name));
+            } else {
+                // unknown, but lowercase the name (our standard practice) and
+                // remove any "x-" prefix
+                QString s = QString::fromLatin1(desktopName.toLower());
+                result.push_back(s.startsWith(QLatin1String("x-")) ? s.mid(2) : s);
             }
         }
-        const QString session = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION"));
-        if (!session.isEmpty() && session != QLatin1String("default") && !result.contains(session))
-            result.push_back(session);
     } // desktopSettingsAware
     result.append(QLatin1String(QGenericUnixTheme::name));
     return result;