diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2015-02-26 20:05:49 (GMT) |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2015-02-27 08:23:19 (GMT) |
| commit | 4ba8bab150ce972f35ae055ddce7e401afda6141 (patch) | |
| tree | dc87e6cc00d117aebe4f300ab927499222022e87 | |
| parent | e50aa2252cdd5cb53eef7d8c4503c7edff634f68 (diff) | |
| download | Qt-4ba8bab150ce972f35ae055ddce7e401afda6141.zip Qt-4ba8bab150ce972f35ae055ddce7e401afda6141.tar.gz Qt-4ba8bab150ce972f35ae055ddce7e401afda6141.tar.bz2 | |
Fix Carbon build
Change-Id: Iae9445d1777ffced3d998e3f9a0a57117fa8d192
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 7a0b047..c7e9352 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -10015,7 +10015,7 @@ QWidget *QWidgetPrivate::childAtRecursiveHelper(const QPoint &p, bool ignoreChil // Map the point 'p' from parent coordinates to child coordinates. QPoint childPoint = p; -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA) // 'includeFrame' is true if the child's parent is a top-level QMainWindow with an unified tool bar. // An unified tool bar on the Mac lives outside QMainWindow's geometry(), so a normal // QWidget::mapFromParent won't do the trick. |