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

Change-Id: Ia3591d7288bac3bf441f27e486d35e2c5c481993

3 files changed, 167 insertions, 41 deletions

diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index 25ecc5bf48..5c2a839781 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -1156,6 +1156,66 @@ static QStyleHelper::WidgetSizePolicy qt_aqua_guess_size(const QWidget *widg, QS
 }
 #endif
 
+static NSColor *qt_convertColorForContext(CGContextRef context, NSColor *color)
+{
+    Q_ASSERT(color);
+    Q_ASSERT(context);
+
+    CGColorSpaceRef targetCGColorSpace = CGBitmapContextGetColorSpace(context);
+    NSColorSpace *targetNSColorSpace = [[NSColorSpace alloc] initWithCGColorSpace:targetCGColorSpace];
+    NSColor *adjusted = [color colorUsingColorSpace:targetNSColorSpace];
+    [targetNSColorSpace release];
+
+    return adjusted;
+}
+
+static NSColor *qt_colorForContext(CGContextRef context, const CGFloat (&rgba)[4])
+{
+    Q_ASSERT(context);
+
+    auto colorSpace = CGBitmapContextGetColorSpace(context);
+    if (!colorSpace)
+        return nil;
+
+    return qt_convertColorForContext(context, [NSColor colorWithSRGBRed:rgba[0] green:rgba[1] blue:rgba[2] alpha:rgba[3]]);
+}
+
+static void qt_drawDisclosureButton(CGContextRef context, NSInteger state, bool selected, CGRect rect)
+{
+    Q_ASSERT(context);
+
+    static const CGFloat gray[] = {0.55, 0.55, 0.55, 0.97};
+    static const CGFloat white[] = {1.0, 1.0, 1.0, 0.9};
+
+    NSColor *fillColor = qt_colorForContext(context, selected ? white : gray);
+    [fillColor setFill];
+
+    if (state == NSOffState) {
+        static NSBezierPath *triangle = [[NSBezierPath alloc] init];
+        [triangle removeAllPoints];
+        // In off state, a disclosure button is an equilateral triangle
+        // ('pointing' to the right) with a bound rect that can be described
+        // as NSMakeRect(0, 0, 8, 9). Inside the 'rect' it's translated by
+        //  (2, 4).
+        [triangle moveToPoint:NSMakePoint(rect.origin.x + 2, rect.origin.y + 4)];
+        [triangle lineToPoint:NSMakePoint(rect.origin.x + 2, rect.origin.y + 4 + 9)];
+        [triangle lineToPoint:NSMakePoint(rect.origin.x + 2 + 8, rect.origin.y + 4 + 4.5)];
+        [triangle closePath];
+        [triangle fill];
+    } else {
+        static NSBezierPath *openTriangle = [[NSBezierPath alloc] init];
+        [openTriangle removeAllPoints];
+        // In 'on' state, the button is an equilateral triangle (looking down)
+        // with the bounding rect NSMakeRect(0, 0, 9, 8). Inside the 'rect'
+        // it's translated by (1, 4).
+        [openTriangle moveToPoint:NSMakePoint(rect.origin.x + 1, rect.origin.y + 4 + 8)];
+        [openTriangle lineToPoint:NSMakePoint(rect.origin.x + 1 + 9, rect.origin.y + 4 + 8)];
+        [openTriangle lineToPoint:NSMakePoint(rect.origin.x + 1 + 4.5, rect.origin.y + 4)];
+        [openTriangle closePath];
+        [openTriangle fill];
+    }
+}
+
 void QMacStylePrivate::drawFocusRing(QPainter *p, const QRectF &targetRect, int hMargin, int vMargin, const CocoaControl &cw) const
 {
     QPainterPath focusRingPath;
@@ -3241,8 +3301,15 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         CGContextScaleCTM(cg, 1, -1);
         CGContextTranslateCTM(cg, -rect.origin.x, -rect.origin.y);
 
-        [triangleCell drawBezelWithFrame:NSRectFromCGRect(rect) inView:[triangleCell controlView]];
-
+        if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave && !qt_mac_applicationIsInDarkMode()) {
+            // When the real system theme is one of the 'Dark' themes, and an application forces the 'Aqua' theme,
+            // under some conditions (see QTBUG-74515 for more details) NSButtonCell seems to select the 'Dark'
+            // code path and is becoming transparent, thus 'invisible' on the white background. To workaround this,
+            // we draw the disclose triangle manually:
+            qt_drawDisclosureButton(cg, triangleCell.state, (opt->state & State_Selected) && viewHasFocus, rect);
+        } else {
+            [triangleCell drawBezelWithFrame:NSRectFromCGRect(rect) inView:[triangleCell controlView]];
+        }
         d->restoreNSGraphicsContext(cg);
         break; }
 
diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
index 959ff6cf64..dfeadebdef 100644
--- a/src/testlib/qappletestlogger.cpp
+++ b/src/testlib/qappletestlogger.cpp
@@ -83,56 +83,56 @@ void QAppleTestLogger::leaveTestFunction()
     testFunctionActivity.leave();
 }
 
-typedef QPair<QtMsgType, const char *> IncidentClassification;
-static IncidentClassification incidentTypeToClassification(QAbstractTestLogger::IncidentTypes type)
+struct MessageData
 {
-    switch (type) {
-    case QAbstractTestLogger::Pass:
-        return IncidentClassification(QtInfoMsg, "pass");
-    case QAbstractTestLogger::XFail:
-        return IncidentClassification(QtInfoMsg, "xfail");
-    case QAbstractTestLogger::Fail:
-        return IncidentClassification(QtCriticalMsg, "fail");
-    case QAbstractTestLogger::XPass:
-        return IncidentClassification(QtInfoMsg, "xpass");
-    case QAbstractTestLogger::BlacklistedPass:
-        return IncidentClassification(QtWarningMsg, "bpass");
-    case QAbstractTestLogger::BlacklistedFail:
-        return IncidentClassification(QtInfoMsg, "bfail");
-    case QAbstractTestLogger::BlacklistedXPass:
-        return IncidentClassification(QtWarningMsg, "bxpass");
-    case QAbstractTestLogger::BlacklistedXFail:
-        return IncidentClassification(QtInfoMsg, "bxfail");
+    QtMsgType messageType = QtFatalMsg;
+    const char *categorySuffix = nullptr;
+
+    void generateCategory(QTestCharBuffer *category)
+    {
+        if (categorySuffix)
+            QTest::qt_asprintf(category, "qt.test.%s", categorySuffix);
+        else
+            QTest::qt_asprintf(category, "qt.test");
     }
-    return IncidentClassification(QtFatalMsg, nullptr);
-}
+};
+
 
 void QAppleTestLogger::addIncident(IncidentTypes type, const char *description,
                                    const char *file, int line)
 {
-
-    IncidentClassification incidentClassification = incidentTypeToClassification(type);
+    MessageData messageData = [=]() {
+        switch (type) {
+        case QAbstractTestLogger::Pass:
+            return MessageData{QtInfoMsg, "pass"};
+        case QAbstractTestLogger::XFail:
+            return MessageData{QtInfoMsg, "xfail"};
+        case QAbstractTestLogger::Fail:
+            return MessageData{QtCriticalMsg, "fail"};
+        case QAbstractTestLogger::XPass:
+            return MessageData{QtInfoMsg, "xpass"};
+        case QAbstractTestLogger::BlacklistedPass:
+            return MessageData{QtWarningMsg, "bpass"};
+        case QAbstractTestLogger::BlacklistedFail:
+            return MessageData{QtInfoMsg, "bfail"};
+        case QAbstractTestLogger::BlacklistedXPass:
+            return MessageData{QtWarningMsg, "bxpass"};
+        case QAbstractTestLogger::BlacklistedXFail:
+            return MessageData{QtInfoMsg, "bxfail"};
+        }
+        Q_UNREACHABLE();
+    }();
 
     QTestCharBuffer category;
-    QTest::qt_asprintf(&category, "qt.test.%s", incidentClassification.second);
-    QMessageLogContext context(file, line, /* function = */ nullptr, category.data());
+    messageData.generateCategory(&category);
 
-    QTestCharBuffer subsystemBuffer;
-    // It would be nice to have the data tag as part of the subsystem too, but that
-    // will for some tests results in hundreds of thousands of log objects being
-    // created, so we limit the subsystem to test functions, which we can hope
-    // are reasonably limited.
-    generateTestIdentifier(&subsystemBuffer, TestObject | TestFunction);
-    QString subsystem = QString::fromLatin1(subsystemBuffer.data());
+    QMessageLogContext context(file, line, /* function = */ nullptr, category.data());
 
-    // We still want the full identifier as part of the message though
-    QTestCharBuffer testIdentifier;
-    generateTestIdentifier(&testIdentifier);
-    QString message = QString::fromLatin1(testIdentifier.data());
+    QString message = testIdentifier();
     if (qstrlen(description))
         message += QLatin1Char('\n') % QString::fromLatin1(description);
 
-    AppleUnifiedLogger::messageHandler(incidentClassification.first, context, message, subsystem);
+    AppleUnifiedLogger::messageHandler(messageData.messageType, context, message, subsystem());
 }
 
 void QAppleTestLogger::addMessage(QtMsgType type, const QMessageLogContext &context, const QString &message)
@@ -140,6 +140,62 @@ void QAppleTestLogger::addMessage(QtMsgType type, const QMessageLogContext &cont
     AppleUnifiedLogger::messageHandler(type, context, message);
 }
 
+void QAppleTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line)
+{
+    MessageData messageData = [=]() {
+        switch (type) {
+        case QAbstractTestLogger::Warn:
+        case QAbstractTestLogger::QWarning:
+            return MessageData{QtWarningMsg, nullptr};
+        case QAbstractTestLogger::QDebug:
+            return MessageData{QtDebugMsg, nullptr};
+        case QAbstractTestLogger::QSystem:
+            return MessageData{QtWarningMsg, "system"};
+        case QAbstractTestLogger::QFatal:
+            return MessageData{QtFatalMsg, nullptr};
+        case QAbstractTestLogger::Skip:
+            return MessageData{QtInfoMsg, "skip"};
+        case QAbstractTestLogger::Info:
+        case QAbstractTestLogger::QInfo:
+            return MessageData{QtInfoMsg, nullptr};
+        }
+        Q_UNREACHABLE();
+    }();
+
+    QTestCharBuffer category;
+    messageData.generateCategory(&category);
+
+    QMessageLogContext context(file, line, /* function = */ nullptr, category.data());
+    QString msg = message;
+
+    if (type == Skip) {
+        if (!message.isNull())
+            msg.prepend(testIdentifier() + QLatin1Char('\n'));
+        else
+            msg = testIdentifier();
+    }
+
+    AppleUnifiedLogger::messageHandler(messageData.messageType, context, msg, subsystem());
+}
+
+QString QAppleTestLogger::subsystem() const
+{
+    QTestCharBuffer buffer;
+    // It would be nice to have the data tag as part of the subsystem too, but that
+    // will for some tests result in hundreds of thousands of log objects being
+    // created, so we limit the subsystem to test functions, which we can hope
+    // are reasonably limited.
+    generateTestIdentifier(&buffer, TestObject | TestFunction);
+    return QString::fromLatin1(buffer.data());
+}
+
+QString QAppleTestLogger::testIdentifier() const
+{
+    QTestCharBuffer buffer;
+    generateTestIdentifier(&buffer);
+    return QString::fromLatin1(buffer.data());
+}
+
 #endif // QT_USE_APPLE_UNIFIED_LOGGING
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
index 4217f4e6a2..62c6d95c5a 100644
--- a/src/testlib/qappletestlogger_p.h
+++ b/src/testlib/qappletestlogger_p.h
@@ -73,11 +73,14 @@ public:
     void addMessage(QtMsgType, const QMessageLogContext &,
             const QString &) override;
     void addMessage(MessageTypes type, const QString &message,
-                            const char *file = 0, int line = 0) override
-    { Q_UNUSED(type); Q_UNUSED(message); Q_UNUSED(file); Q_UNUSED(line); Q_UNREACHABLE(); }
+                            const char *file = 0, int line = 0) override;
 
     void addBenchmarkResult(const QBenchmarkResult &result) override
     { Q_UNUSED(result); }
+
+private:
+    QString subsystem() const;
+    QString testIdentifier() const;
 };
 #endif