diff options
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index a6b44cde15..d50c42f1ee 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -717,8 +717,8 @@ void QColor::setHsv(int h, int s, int v, int a) saturation, lightness, and alpha-channel (transparency) components of the color's HSL value. - These components can be retrieved individually using the hueHslF(), - saturationHslF(), lightnessF() and alphaF() functions. + These components can be retrieved individually using the hslHueF(), + hslSaturationF(), lightnessF() and alphaF() functions. \sa setHsl() */ @@ -747,8 +747,8 @@ void QColor::getHslF(qreal *h, qreal *s, qreal *l, qreal *a) const saturation, lightness, and alpha-channel (transparency) components of the color's HSL value. - These components can be retrieved individually using the hueHsl(), - saturationHsl(), lightness() and alpha() functions. + These components can be retrieved individually using the hslHue(), + hslSaturation(), lightness() and alpha() functions. \sa setHsl() */ diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 86959869cc..495d5831f7 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1254,7 +1254,9 @@ QCocoaGLContext *QCocoaWindow::currentContext() const void QCocoaWindow::recreateWindow(const QPlatformWindow *parentWindow) { bool wasNSWindowChild = m_isNSWindowChild; - m_isNSWindowChild = parentWindow && (window()->property("_q_platform_MacUseNSWindow").toBool()); + BOOL requestNSWindowChild = qt_mac_resolveOption(NO, window(), "_q_platform_MacUseNSWindow", + "QT_MAC_USE_NSWINDOW"); + m_isNSWindowChild = parentWindow && requestNSWindowChild; bool needsNSWindow = m_isNSWindowChild || !parentWindow; QCocoaWindow *oldParentCocoaWindow = m_parentCocoaWindow; |