diff options
-rw-r--r-- | src/3rdparty/libjpeg/COPYRIGHT.txt | 12 | ||||
-rw-r--r-- | src/3rdparty/libjpeg/qt_attribution.json | 13 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qnswindow.mm | 14 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 |
4 files changed, 26 insertions, 15 deletions
diff --git a/src/3rdparty/libjpeg/COPYRIGHT.txt b/src/3rdparty/libjpeg/COPYRIGHT.txt deleted file mode 100644 index cfeb0eacfc..0000000000 --- a/src/3rdparty/libjpeg/COPYRIGHT.txt +++ /dev/null @@ -1,12 +0,0 @@ -Copyright (C) 2009-2021 D. R. Commander -Copyright (C) 2015, 2020 Google, Inc. -Copyright (C) 2019-2020 Arm Limited -Copyright (C) 2015-2016, 2018 Matthieu Darbois -Copyright (C) 2011-2016 Siarhei Siamashka -Copyright (C) 2015 Intel Corporation -Copyright (C) 2013-2014 Linaro Limited -Copyright (C) 2013-2014 MIPS Technologies, Inc. -Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB -Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) -Copyright (C) 1999-2006 MIYASAKA Masaru -Copyright (C) 1991-2020 Thomas G. Lane, Guido Vollbeding diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json index ff4d98fb54..b68563cb79 100644 --- a/src/3rdparty/libjpeg/qt_attribution.json +++ b/src/3rdparty/libjpeg/qt_attribution.json @@ -10,5 +10,16 @@ "License": "Independent JPEG Group License and BSD 3-Clause \"New\" or \"Revised\" License and zlib License", "LicenseId": "IJG AND BSD-3-Clause AND Zlib", "LicenseFiles": [ "LICENSE", "ijg-license.txt", "zlib-license.txt"], - "CopyrightFile": "COPYRIGHT.txt" + "Copyright": "Copyright (C) 2009-2021 D. R. Commander +Copyright (C) 2015, 2020 Google, Inc. +Copyright (C) 2019 Arm Limited +Copyright (C) 2015-2016, 2018 Matthieu Darbois +Copyright (C) 2011-2016 Siarhei Siamashka +Copyright (C) 2015 Intel Corporation +Copyright (C) 2013-2014 Linaro Limited +Copyright (C) 2013-2014 MIPS Technologies, Inc. +Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB +Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) +Copyright (C) 1999-2006 MIYASAKA Masaru +Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding" } diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm index 1a74fd73f8..8cff444359 100644 --- a/src/plugins/platforms/cocoa/qnswindow.mm +++ b/src/plugins/platforms/cocoa/qnswindow.mm @@ -253,8 +253,18 @@ static bool isMouseEvent(NSEvent *ev) - (NSColor *)backgroundColor { - return self.styleMask == NSWindowStyleMaskBorderless ? - [NSColor clearColor] : [super backgroundColor]; + // FIXME: Plumb to a WA_NoSystemBackground-like window flag, + // or a QWindow::backgroundColor() property. In the meantime + // we assume that if you have translucent content, without a + // frame then you intend to do all background drawing yourself. + const QWindow *window = m_platformWindow ? m_platformWindow->window() : nullptr; + if (!self.opaque && window && window->flags().testFlag(Qt::FramelessWindowHint)) + return [NSColor clearColor]; + + // This still allows you to have translucent content with a frame, + // where the system background (or color set via NSWindow) will + // shine through. + return [super backgroundColor]; } - (void)sendEvent:(NSEvent*)theEvent diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 85fa2ffe39..02a1980e09 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -910,6 +910,8 @@ void QWidget::setAutoFillBackground(bool enabled) and a compositing window manager. \li Windows: The widget needs to have the Qt::FramelessWindowHint window flag set for the translucency to work. + \li \macos: The widget needs to have the Qt::FramelessWindowHint window flag set + for the translucency to work. \endlist |