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

Conflicts:
	src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd

4 files changed, 8 insertions, 8 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 2b9e928266..3588948133 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -615,7 +615,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
     return fallbackLists[styleLookupKey.arg(styleHint)];
 }
 
-static CFArrayRef createDescriptorArrayForFont(CTFontRef font, const QString &fileName = QString())
+CFArrayRef QCoreTextFontDatabase::createDescriptorArrayForFont(CTFontRef font, const QString &fileName)
 {
     CFMutableArrayRef array = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
     QCFType<CTFontDescriptorRef> descriptor = CTFontCopyFontDescriptor(font);
@@ -625,7 +625,7 @@ static CFArrayRef createDescriptorArrayForFont(CTFontRef font, const QString &fi
     // The physical font source URL (usually a local file or Qt resource) is only required for
     // FreeType, when using non-system fonts, and needs some hackery to attach in a format
     // agreeable to OSX.
-    if (!fileName.isEmpty()) {
+    if (m_useFreeType && !fileName.isEmpty()) {
         QCFType<CFURLRef> fontURL;
 
         if (fileName.startsWith(QLatin1String(":/"))) {
@@ -662,11 +662,7 @@ QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData
         if (cgFont) {
             if (CTFontManagerRegisterGraphicsFont(cgFont, &error)) {
                 QCFType<CTFontRef> font = CTFontCreateWithGraphicsFont(cgFont, 0.0, NULL, NULL);
-                fonts = createDescriptorArrayForFont(font
-#ifndef QT_NO_FREETYPE
-                                                     , m_useFreeType ? fileName : QString()
-#endif
-                                                     );
+                fonts = createDescriptorArrayForFont(font, fileName);
                 m_applicationFonts.append(QVariant::fromValue(QCFType<CGFontRef>::constructFromGet(cgFont)));
             }
         }
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 344e235053..4caa50afbe 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -58,6 +58,7 @@
 #include <private/qcore_mac_p.h>
 
 Q_FORWARD_DECLARE_CF_TYPE(CTFontDescriptor);
+Q_FORWARD_DECLARE_CF_TYPE(CTFont);
 
 Q_DECLARE_METATYPE(QCFType<CGFontRef>);
 Q_DECLARE_METATYPE(QCFType<CFURLRef>);
@@ -88,6 +89,7 @@ public:
 
 private:
     void populateFromDescriptor(CTFontDescriptorRef font, const QString &familyName = QString());
+    CFArrayRef createDescriptorArrayForFont(CTFontRef font, const QString &fileName);
 
 #ifndef QT_NO_FREETYPE
     bool m_useFreeType;
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
index fb0705c8c7..b13c875854 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
@@ -120,7 +120,7 @@ void QDBusMenuBar::syncMenu(QPlatformMenu *menu)
 
 void QDBusMenuBar::handleReparent(QWindow *newParentWindow)
 {
-    if (newParentWindow && newParentWindow->winId() != m_windowId) {
+    if (newParentWindow) {
         unregisterMenuBar();
         m_windowId = newParentWindow->winId();
         registerMenuBar();
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index 4eefcace0f..e9116223bd 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -555,6 +555,7 @@ QIcon QKdeTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions
 #if QT_CONFIG(mimetype)
     return xdgFileIcon(fileInfo);
 #else
+    Q_UNUSED(fileInfo);
     return QIcon();
 #endif
 }
@@ -720,6 +721,7 @@ QIcon QGnomeTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptio
 #if QT_CONFIG(mimetype)
     return xdgFileIcon(fileInfo);
 #else
+    Q_UNUSED(fileInfo);
     return QIcon();
 #endif
 }