Merge remote branch 'gerrit/master' into refactor

Conflicts:
	src/gui/kernel/qapplication_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/gui/widgets/qlinecontrol_p.h
	src/gui/widgets/qtabwidget.h

Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736

1 files changed, 24 insertions, 1 deletions

diff --git a/tests/auto/qrawfont/tst_qrawfont.cpp b/tests/auto/qrawfont/tst_qrawfont.cpp
index e0680c4257..eb78057b5e 100644
--- a/tests/auto/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/qrawfont/tst_qrawfont.cpp
@@ -47,7 +47,6 @@
 class tst_QRawFont: public QObject
 {
     Q_OBJECT
-
 #if !defined(QT_NO_RAWFONT)
 private slots:
     void invalidRawFont();
@@ -94,6 +93,11 @@ private slots:
 
     void rawFontSetPixelSize_data();
     void rawFontSetPixelSize();
+
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
+    void multipleRawFontsFromData();
+#endif
+
 #endif // QT_NO_RAWFONT
 };
 
@@ -843,6 +847,25 @@ void tst_QRawFont::rawFontSetPixelSize()
     QCOMPARE(rawFont.pixelSize(), 24.0);
 }
 
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
+void tst_QRawFont::multipleRawFontsFromData()
+{
+    QFile file(QString::fromLatin1(SRCDIR "testfont.ttf"));
+    QRawFont testFont;
+    if (file.open(QIODevice::ReadOnly)) {
+        testFont.loadFromData(file.readAll(), 11, QFont::PreferDefaultHinting);
+        file.close();
+    }
+    file.setFileName(QLatin1String(SRCDIR "testfont_bold_italic.ttf"));
+    QRawFont testFontBoldItalic;
+    if (file.open(QIODevice::ReadOnly))
+        testFontBoldItalic.loadFromData(file.readAll(), 11, QFont::PreferDefaultHinting);
+
+    QVERIFY(testFont.familyName() != (testFontBoldItalic.familyName())
+            || testFont.styleName() != (testFontBoldItalic.styleName()));
+}
+#endif
+
 #endif // QT_NO_RAWFONT
 
 QTEST_MAIN(tst_QRawFont)