diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2014-10-28 19:17:01 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2014-10-30 10:49:30 +0100 |
| commit | c9b49612fff597498a03a5d8161765f03bc54e53 (patch) | |
| tree | deb36848bab5b8cea890d13934131b9972effd71 /src/widgets/styles/qmacstyle_mac_p_p.h | |
| parent | 3f3955fec533c77639d6f1eb20cff593597d6222 (diff) | |
QMacStyle: Several fixes for QtQuick Controls on Yosemite
Some offsets differ between QWidgets and Controls. Therefore, we need
drawNSViewInRect() to know about the origin of the call.
Change-Id: I3bd165f94731f2b37423d86ed5d3c302a17d5ef5
Task-number: QTBUG-42067
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac_p_p.h')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 80b0afe4a4..89a95713b7 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -206,7 +206,7 @@ public: NSView *cocoaControl(QCocoaWidget widget) const; - void drawNSViewInRect(QCocoaWidget widget, NSView *view, const QRect &rect, QPainter *p, QCocoaDrawRectBlock drawRectBlock = nil) const; + void drawNSViewInRect(QCocoaWidget widget, NSView *view, const QRect &rect, QPainter *p, bool isQWidget = true, QCocoaDrawRectBlock drawRectBlock = nil) const; void resolveCurrentNSView(QWindow *window); public: |