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

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 0 insertions, 65 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 3718ebdda6..ba23271e55 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -117,71 +117,6 @@ static NSInteger languageMapSort(id obj1, id obj2, void *context)
 QCoreTextFontDatabase::QCoreTextFontDatabase()
     : m_hasPopulatedAliases(false)
 {
-#ifdef Q_OS_MACX
-    /*
-        font_smoothing = 0 means no smoothing, while 1-3 means subpixel
-        antialiasing with different hinting styles (but we don't care about the
-        exact value, only if subpixel rendering is available or not)
-    */
-    int font_smoothing = 0;
-
-#if QT_CONFIG(settings)
-    QSettings appleSettings(QLatin1String("apple.com"));
-    QVariant appleValue = appleSettings.value(QLatin1String("AppleAntiAliasingThreshold"));
-    if (appleValue.isValid())
-        QCoreTextFontEngine::antialiasingThreshold = appleValue.toInt();
-
-    appleValue = appleSettings.value(QLatin1String("AppleFontSmoothing"));
-    if (appleValue.isValid()) {
-        font_smoothing = appleValue.toInt();
-    } else
-#endif // settings
-    {
-        // non-Apple displays do not provide enough information about subpixel rendering so
-        // draw text with cocoa and compare pixel colors to see if subpixel rendering is enabled
-        int w = 10;
-        int h = 10;
-        NSRect rect = NSMakeRect(0.0, 0.0, w, h);
-        NSImage *fontImage = [[NSImage alloc] initWithSize:NSMakeSize(w, h)];
-
-        [fontImage lockFocus];
-
-        [[NSColor whiteColor] setFill];
-        NSRectFill(rect);
-
-        NSString *str = @"X\\";
-        NSFont *font = [NSFont fontWithName:@"Helvetica" size:10.0];
-        NSMutableDictionary *attrs = [NSMutableDictionary dictionary];
-        [attrs setObject:font forKey:NSFontAttributeName];
-        [attrs setObject:[NSColor blackColor] forKey:NSForegroundColorAttributeName];
-
-        [str drawInRect:rect withAttributes:attrs];
-
-        NSBitmapImageRep *nsBitmapImage = [[NSBitmapImageRep alloc] initWithFocusedViewRect:rect];
-
-        [fontImage unlockFocus];
-
-        float red, green, blue;
-        for (int x = 0; x < w; x++) {
-            for (int y = 0; y < h; y++) {
-                NSColor *pixelColor = [nsBitmapImage colorAtX:x y:y];
-                red = [pixelColor redComponent];
-                green = [pixelColor greenComponent];
-                blue = [pixelColor blueComponent];
-                if (red != green || red != blue)
-                    font_smoothing = 1;
-            }
-        }
-
-        [nsBitmapImage release];
-        [fontImage release];
-    }
-    QCoreTextFontEngine::defaultGlyphFormat = (font_smoothing > 0
-                                               ? QFontEngine::Format_A32
-                                               : QFontEngine::Format_A8);
-#else
-    QCoreTextFontEngine::defaultGlyphFormat = QFontEngine::Format_A8;
-#endif
 }
 
 QCoreTextFontDatabase::~QCoreTextFontDatabase()