Commit 8b833b82 authored by Christian Kandeler's avatar Christian Kandeler

Remove some workarounds for Qt bugs that have been fixed.

Change-Id: I0e7112ee3f3790fba42fc882cb98e06ec6a2186d
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent 9073c550
......@@ -81,15 +81,10 @@ DragWidget::DragWidget(QWidget *parent) : QFrame(parent)
setFrameShadow(QFrame::Sunken);
m_startPos = QPoint(-1, -1);
m_pos = QPoint(-1, -1);
// TODO: The following code should be enabled for OSX
// when QTBUG-23205 is fixed
if (!HostOsInfo::isMacHost()) {
m_dropShadowEffect = new QGraphicsDropShadowEffect;
m_dropShadowEffect->setBlurRadius(6);
m_dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(m_dropShadowEffect);
}
m_dropShadowEffect = new QGraphicsDropShadowEffect;
m_dropShadowEffect->setBlurRadius(6);
m_dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(m_dropShadowEffect);
}
void DragWidget::mousePressEvent(QMouseEvent * event)
......@@ -107,14 +102,10 @@ 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
if (!HostOsInfo::isMacHost()) {
m_dropShadowEffect = new QGraphicsDropShadowEffect;
m_dropShadowEffect->setBlurRadius(6);
m_dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(m_dropShadowEffect);
}
m_dropShadowEffect = new QGraphicsDropShadowEffect;
m_dropShadowEffect->setBlurRadius(6);
m_dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(m_dropShadowEffect);
}
QFrame::mouseReleaseEvent(event);
}
......
......@@ -30,8 +30,6 @@
#include "contextpanewidgetimage.h"
#include <utils/hostosinfo.h>
#include "ui_contextpanewidgetimage.h"
#include "ui_contextpanewidgetborderimage.h"
#include <qmljs/qmljspropertyreader.h>
......@@ -633,15 +631,10 @@ 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
if (!Utils::HostOsInfo::isMacHost()) {
QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect;
dropShadowEffect->setBlurRadius(4);
dropShadowEffect->setOffset(2, 2);
m_hooverInfo->setGraphicsEffect(dropShadowEffect);
}
QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect;
dropShadowEffect->setBlurRadius(4);
dropShadowEffect->setOffset(2, 2);
m_hooverInfo->setGraphicsEffect(dropShadowEffect);
m_hooverInfo->setAutoFillBackground(true);
m_hooverInfo->raise();
}
......
......@@ -54,14 +54,10 @@ 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
if (!HostOsInfo::isMacHost()) {
QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect;
dropShadowEffect->setBlurRadius(6);
dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(dropShadowEffect);
}
QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect;
dropShadowEffect->setBlurRadius(6);
dropShadowEffect->setOffset(2, 2);
setGraphicsEffect(dropShadowEffect);
setAutoFillBackground(true);
m_hueControl = new HueControl(this);
......
......@@ -419,27 +419,11 @@ void MenuActionContainer::removeMenu(QMenu *menu)
m_menu->removeAction(menu->menuAction());
}
static bool menuInMenuBar(const QMenu *menu)
{
foreach (const QWidget *widget, menu->menuAction()->associatedWidgets()) {
if (qobject_cast<const QMenuBar *>(widget))
return true;
}
return false;
}
bool MenuActionContainer::updateInternal()
{
if (onAllDisabledBehavior() == Show)
return true;
if (Utils::HostOsInfo::isMacHost()) {
// work around QTBUG-25544 which makes menus in the menu bar stay at their enabled state at startup
// (so menus that are disabled at startup would stay disabled)
if (menuInMenuBar(m_menu))
return true;
}
bool hasitems = false;
QList<QAction *> actions = m_menu->actions();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment