Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

9 files changed, 199 insertions, 21 deletions

diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7d3e5957cc
--- /dev/null
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -0,0 +1,130 @@
+# Generated from fontdatabases.pro.
+
+#####################################################################
+## FontDatabaseSupport Module:
+#####################################################################
+
+add_qt_module(FontDatabaseSupport
+    STATIC
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>:
+# CONFIG = "static" "internal_module"
+# MODULE = "fontdatabase_support"
+# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(FontDatabaseSupport CONDITION APPLE
+    SOURCES
+        mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h
+        mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWCoreGraphics}
+        ${FWCoreText}
+        ${FWFoundation}
+)
+
+extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+)
+
+extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+    LIBRARIES
+        ${FWUIKit}
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
+    SOURCES
+        freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h
+        freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+extend_target(FontDatabaseSupport CONDITION UNIX
+    SOURCES
+        genericunix/qgenericunixfontdatabase_p.h
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+    SOURCES
+        fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
+        fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
+    LIBRARIES
+        Fontconfig::Fontconfig
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
+        windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
+        windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
+    LIBRARIES
+        Qt::GuiPrivate
+        advapi32
+        gdi32
+        ole32
+        user32
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h
+    LIBRARIES
+        d2d1
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT WINRT
+    DEFINES
+        QT_USE_DIRECTWRITE2
+    LIBRARIES
+        dwrite_2
+)
+
+extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT WINRT
+    LIBRARIES
+        dwrite
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite)
+    DEFINES
+        QT_NO_DIRECTWRITE
+)
+
+extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+    LIBRARIES
+        uuid
+)
+
+extend_target(FontDatabaseSupport CONDITION WINRT
+    SOURCES
+        winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h
+    DEFINES
+        __WRL_NO_DEFAULT_LIB__
+    LIBRARIES
+        Qt::GuiPrivate
+        dwrite_1
+        ws2_32
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 6ffc2fb2f3..e93ec38237 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -77,12 +77,12 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
     LIBRARIES
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
         advapi32
         gdi32
         ole32
         user32
+    PUBLIC_LIBRARIES
+        Qt::Gui
 )
 
 extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
@@ -115,7 +115,7 @@ extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEAT
 )
 
 extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
-    PUBLIC_LIBRARIES
+    LIBRARIES
         uuid
 )
 
@@ -127,7 +127,7 @@ extend_target(FontDatabaseSupport CONDITION WINRT
     LIBRARIES
         Qt::GuiPrivate
         dwrite_1
+        ws2_32
     PUBLIC_LIBRARIES
         Qt::Gui
-        ws2_32
 )
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 40db7dbac7..99666bcec6 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -984,7 +984,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
                      || matrix.xy != 0
                      || matrix.yx != 0;
 
-    if (transform || (format != Format_Mono && !isScalableBitmap()))
+    if (transform || obliquen || (format != Format_Mono && !isScalableBitmap()))
         load_flags |= FT_LOAD_NO_BITMAP;
 
     FT_Error err = FT_Load_Glyph(face, glyph, load_flags);
diff --git a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
index 4baba64de3..25c10fbd3c 100644
--- a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
@@ -127,7 +127,7 @@ QStringList QFreeTypeFontDatabase::addTTFile(const QByteArray &fontData, const Q
             error = FT_New_Face(library, file.constData(), index, &face);
         }
         if (error != FT_Err_Ok) {
-            qDebug() << "FT_New_Face failed with index" << index << ':' << hex << error;
+            qDebug() << "FT_New_Face failed with index" << index << ':' << Qt::hex << error;
             break;
         }
         numFaces = face->num_faces;
@@ -142,7 +142,6 @@ QStringList QFreeTypeFontDatabase::addTTFile(const QByteArray &fontData, const Q
             weight = QFont::Bold;
 
         bool fixedPitch = (face->face_flags & FT_FACE_FLAG_FIXED_WIDTH);
-
         QSupportedWritingSystems writingSystems;
         // detect symbol fonts
         for (int i = 0; i < face->num_charmaps; ++i) {
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index b1ba84fe14..9d25422ca5 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1007,12 +1007,27 @@ static QChar *createFontFile(const QString &faceName)
     return faceNamePtr;
 }
 
+namespace {
+    struct StoreFontPayload {
+        StoreFontPayload(const QString &family,
+                         QWindowsFontDatabase *fontDatabase)
+            : populatedFontFamily(family)
+            , windowsFontDatabase(fontDatabase)
+        {}
+
+        QString populatedFontFamily;
+        QSet<QPair<QString,QString> > foundFontAndStyles;
+        QWindowsFontDatabase *windowsFontDatabase;
+    };
+}
+
 static bool addFontToDatabase(QString familyName,
                               QString styleName,
                               const LOGFONT &logFont,
                               const TEXTMETRIC *textmetric,
                               const FONTSIGNATURE *signature,
-                              int type)
+                              int type,
+                              StoreFontPayload *sfp)
 {
     // the "@family" fonts are just the same as "family". Ignore them.
     if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QLatin1String("WST_")))
@@ -1092,6 +1107,16 @@ static bool addFontToDatabase(QString familyName,
             writingSystems.setSupported(ws);
     }
 
+    // We came here from populating a different font family, so we have
+    // to ensure the entire typographic family is populated before we
+    // mark it as such inside registerFont()
+    if (!subFamilyName.isEmpty()
+            && familyName != subFamilyName
+            && sfp->populatedFontFamily != familyName
+            && !QPlatformFontDatabase::isFamilyPopulated(familyName)) {
+        sfp->windowsFontDatabase->populateFamily(familyName);
+    }
+
     QPlatformFontDatabase::registerFont(familyName, styleName, foundryName, weight,
                                         style, stretch, antialias, scalable, size, fixed, writingSystems, createFontFile(faceName));
 
@@ -1118,7 +1143,7 @@ static bool addFontToDatabase(QString familyName,
 }
 
 static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *textmetric,
-                                     DWORD type, LPARAM)
+                                     DWORD type, LPARAM lparam)
 {
     const ENUMLOGFONTEX *f = reinterpret_cast<const ENUMLOGFONTEX *>(logFont);
     const QString familyName = QString::fromWCharArray(f->elfLogFont.lfFaceName);
@@ -1128,9 +1153,18 @@ static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *t
     // to the documentation is identical to a TEXTMETRIC except for the last four
     // members, which we don't use anyway
     const FONTSIGNATURE *signature = nullptr;
-    if (type & TRUETYPE_FONTTYPE)
+    StoreFontPayload *sfp = reinterpret_cast<StoreFontPayload *>(lparam);
+    Q_ASSERT(sfp != nullptr);
+    if (type & TRUETYPE_FONTTYPE) {
         signature = &reinterpret_cast<const NEWTEXTMETRICEX *>(textmetric)->ntmFontSig;
-    addFontToDatabase(familyName, styleName, *logFont, textmetric, signature, type);
+        // We get a callback for each script-type supported, but we register them all
+        // at once using the signature, so we only need one call to addFontToDatabase().
+        QPair<QString,QString> fontAndStyle(familyName, styleName);
+        if (sfp->foundFontAndStyles.contains(fontAndStyle))
+            return 1;
+        sfp->foundFontAndStyles.insert(fontAndStyle);
+    }
+    addFontToDatabase(familyName, styleName, *logFont, textmetric, signature, type, sfp);
 
     // keep on enumerating
     return 1;
@@ -1149,7 +1183,8 @@ void QWindowsFontDatabase::populateFamily(const QString &familyName)
     familyName.toWCharArray(lf.lfFaceName);
     lf.lfFaceName[familyName.size()] = 0;
     lf.lfPitchAndFamily = 0;
-    EnumFontFamiliesEx(dummy, &lf, storeFont, 0, 0);
+    StoreFontPayload sfp(familyName, this);
+    EnumFontFamiliesEx(dummy, &lf, storeFont, reinterpret_cast<intptr_t>(&sfp), 0);
     ReleaseDC(0, dummy);
 }
 
@@ -1589,8 +1624,9 @@ QStringList QWindowsFontDatabase::addApplicationFont(const QByteArray &fontData,
             TEXTMETRIC textMetrics;
             GetTextMetrics(hdc, &textMetrics);
 
+            StoreFontPayload sfp(familyName, this);
             addFontToDatabase(familyName, styleName, lf, &textMetrics, &signatures.at(j),
-                              TRUETYPE_FONTTYPE);
+                              TRUETYPE_FONTTYPE, &sfp);
 
             SelectObject(hdc, oldobj);
             DeleteObject(hfont);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index db2186644b..a6b7fcf31e 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -48,7 +48,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 #include <QtCore/QSettings>
+#if QT_CONFIG(regularexpression)
 #include <QtCore/QRegularExpression>
+#else
+#include <QtCore/QRegExp>
+#endif
 #include <QtGui/QGuiApplication>
 #include <QtGui/QFontDatabase>
 
@@ -303,7 +307,7 @@ static bool addFontToDatabase(QString familyName,
 }
 
 static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *textmetric,
-                                     DWORD type, LPARAM)
+                                     DWORD type, LPARAM lparam)
 {
     const ENUMLOGFONTEX *f = reinterpret_cast<const ENUMLOGFONTEX *>(logFont);
     const QString faceName = QString::fromWCharArray(f->elfLogFont.lfFaceName);
@@ -314,8 +318,16 @@ static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *t
     // to the documentation is identical to a TEXTMETRIC except for the last four
     // members, which we don't use anyway
     const FONTSIGNATURE *signature = nullptr;
-    if (type & TRUETYPE_FONTTYPE)
+    if (type & TRUETYPE_FONTTYPE) {
         signature = &reinterpret_cast<const NEWTEXTMETRICEX *>(textmetric)->ntmFontSig;
+        // We get a callback for each script-type supported, but we register them all
+        // at once using the signature, so we only need one call to addFontToDatabase().
+        QSet<QPair<QString,QString>> *foundFontAndStyles = reinterpret_cast<QSet<QPair<QString,QString>> *>(lparam);
+        QPair<QString,QString> fontAndStyle(faceName, styleName);
+        if (foundFontAndStyles->contains(fontAndStyle))
+            return 1;
+        foundFontAndStyles->insert(fontAndStyle);
+    }
     addFontToDatabase(faceName, styleName, fullName, *logFont, textmetric, signature, type);
 
     // keep on enumerating
@@ -344,7 +356,8 @@ void QWindowsFontDatabaseFT::populateFamily(const QString &familyName)
     lf.lfFaceName[familyName.size()] = 0;
     lf.lfCharSet = DEFAULT_CHARSET;
     lf.lfPitchAndFamily = 0;
-    EnumFontFamiliesEx(dummy, &lf, storeFont, 0, 0);
+    QSet<QPair<QString,QString>> foundFontAndStyles;
+    EnumFontFamiliesEx(dummy, &lf, storeFont, reinterpret_cast<intptr_t>(&foundFontAndStyles), 0);
     ReleaseDC(0, dummy);
 }
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index b85a2dceee..a1cab17a87 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -96,6 +96,8 @@ public:
     QWindowsFontDatabase();
     ~QWindowsFontDatabase() override;
 
+    void ensureFamilyPopulated(const QString &familyName);
+
     void populateFontDatabase() override;
     void populateFamily(const QString &familyName) override;
     QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
diff --git a/src/platformsupport/fontdatabases/windows/windows.pri b/src/platformsupport/fontdatabases/windows/windows.pri
index 9c529f55ea..7ddfb2c281 100644
--- a/src/platformsupport/fontdatabases/windows/windows.pri
+++ b/src/platformsupport/fontdatabases/windows/windows.pri
@@ -30,5 +30,5 @@ qtConfig(directwrite):qtConfig(direct2d) {
     DEFINES *= QT_NO_DIRECTWRITE
 }
 
-LIBS += -lole32 -lgdi32 -luser32 -ladvapi32
-mingw: LIBS += -luuid
+QMAKE_USE_PRIVATE += advapi32 ole32 user32 gdi32
+mingw: QMAKE_USE_PRIVATE += uuid
diff --git a/src/platformsupport/fontdatabases/winrt/winrt.pri b/src/platformsupport/fontdatabases/winrt/winrt.pri
index 7617df2e7a..1cd417c1fd 100644
--- a/src/platformsupport/fontdatabases/winrt/winrt.pri
+++ b/src/platformsupport/fontdatabases/winrt/winrt.pri
@@ -8,6 +8,4 @@ HEADERS += \
 
 DEFINES += __WRL_NO_DEFAULT_LIB__
 
-LIBS += -lws2_32
-
-QMAKE_USE_PRIVATE += dwrite_1
+QMAKE_USE_PRIVATE += dwrite_1 ws2_32