From f2399eb7754e542f78d28c877863679b92206c3d Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Thu, 5 Jul 2012 14:00:45 +0200 Subject: [PATCH] Disable QGraphicsDropShadowEffect for Mac The QGraphicsDropShadowEffect::draw() results in a crash on Mac https://bugreports.qt-project.org/browse/QTBUG-23205 . Task-number: QTCREATORBUG-7605 Change-Id: Icee71e6452997b2daede7ef4735e508caf68aa1a Reviewed-by: Thomas Hartmann (cherry picked from commit d0152332a47837e1ec8522175a0a6d3571c4fba5) Reviewed-by: Aurindam Jana --- src/libs/qmleditorwidgets/contextpanewidget.cpp | 8 ++++++++ src/libs/qmleditorwidgets/contextpanewidgetimage.cpp | 4 ++++ src/libs/qmleditorwidgets/customcolordialog.cpp | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index d6c6621c804..c33f4142fd7 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -102,10 +102,14 @@ DragWidget::DragWidget(QWidget *parent) : QFrame(parent) m_startPos = QPoint(-1, -1); m_pos = QPoint(-1, -1); + // TODO: The following code should be enabled for OSX + // when QTBUG-23205 is fixed +#ifndef Q_OS_MAC m_dropShadowEffect = new QGraphicsDropShadowEffect; m_dropShadowEffect->setBlurRadius(6); m_dropShadowEffect->setOffset(2, 2); setGraphicsEffect(m_dropShadowEffect); +#endif } void DragWidget::mousePressEvent(QMouseEvent * event) @@ -123,10 +127,14 @@ void DragWidget::mouseReleaseEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { m_startPos = QPoint(-1, -1); + // TODO: The following code should be enabled for OSX + // when QTBUG-23205 is fixed +#ifndef Q_OS_MAC m_dropShadowEffect = new QGraphicsDropShadowEffect; m_dropShadowEffect->setBlurRadius(6); m_dropShadowEffect->setOffset(2, 2); setGraphicsEffect(m_dropShadowEffect); +#endif } QFrame::mouseReleaseEvent(event); } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index fd5f3256e93..6b984a183b2 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -611,10 +611,14 @@ PreviewLabel::PreviewLabel(QWidget *parent) m_hooverInfo->setFrameShape(QFrame::StyledPanel); m_hooverInfo->setFrameShadow(QFrame::Sunken); + // TODO: The following code should be enabled for OSX + // when QTBUG-23205 is fixed +#ifndef Q_OS_MAC QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect; dropShadowEffect->setBlurRadius(4); dropShadowEffect->setOffset(2, 2); m_hooverInfo->setGraphicsEffect(dropShadowEffect); +#endif m_hooverInfo->setAutoFillBackground(true); m_hooverInfo->raise(); } diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index 59bd6744ebe..f683976599b 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -52,10 +52,14 @@ CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent ) setFrameShape(QFrame::StyledPanel); setFrameShadow(QFrame::Sunken); + // TODO: The following code should be enabled for OSX + // when QTBUG-23205 is fixed +#ifndef Q_OS_MAC QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect; dropShadowEffect->setBlurRadius(6); dropShadowEffect->setOffset(2, 2); setGraphicsEffect(dropShadowEffect); +#endif setAutoFillBackground(true); m_hueControl = new HueControl(this);