From a6143eeb09ce95b6c26870d743ec98b972487d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 24 Sep 2018 11:54:21 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@430 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/application/edockwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qad/application/edockwidget.cpp b/qad/application/edockwidget.cpp index 44e68b8..707bfdf 100644 --- a/qad/application/edockwidget.cpp +++ b/qad/application/edockwidget.cpp @@ -17,12 +17,14 @@ void EDockWidget::setWindowTitle(const QString & title) { void EDockWidget::setWindowIcon(const QIcon & icon) { +#ifndef Q_OS_MACOS lbl_icon->setPixmap(icon.pixmap(QSize(256, 256))); QDockWidget::setWindowIcon(icon); if (!icon.isNull()) { lbl_icon->setScaledContents(true); lbl_icon->setFixedSize(preferredIconSize(1.5)); } +#endif } @@ -33,6 +35,7 @@ void EDockWidget::init() { lay->setContentsMargins(2, 2, 2, 2); lay->setSpacing(2); lbl_icon = new QLabel(); +#ifndef Q_OS_MACOS QIcon wi = windowIcon(); if (!wi.isNull()) { lbl_icon->setPixmap(wi.pixmap(QSize(256,256))); @@ -45,6 +48,7 @@ void EDockWidget::init() { lbl_icon->setFixedSize(preferredIconSize(1.5)); } lbl_icon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); +#endif lbl_title = new QLabel(windowTitle()); lbl_title->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); btn_dock = new QToolButton();