git-svn-id: svn://db.shs.com.ru/libs@433 a8b55f48-bf90-11e4-a774-851b48703e85

qad/application/edockwidget.cpp

@@ -73,9 +73,7 @@ void EDockWidget::init() {
 	btn_hide->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	connect(btn_dock, SIGNAL(clicked(bool)), this, SLOT(dockClicked()));
 	connect(btn_hide, SIGNAL(clicked(bool)), this, SLOT(hide()));
-#ifndef Q_OS_MACOS
 	lay->addWidget(lbl_icon);
-#endif
 	lay->addWidget(lbl_title);
 	lay->addWidget(btn_dock);
 	lay->addWidget(btn_hide);

qad/application/emainwindow.cpp

@@ -289,7 +289,9 @@ void EMainWindow::changedDock() {
 			//qDebug() << i << t->tabData(i);
 			if (dock == 0) continue;
 			t->setIconSize(dockTabsIconSize());
+#ifndef Q_OS_MACOS
 			t->setTabIcon(i, dock->windowIcon());
+#endif
 			docks_tabs << dock;
 		}
 	}

qad/utils/qad_types.cpp

@@ -137,6 +137,9 @@ int lineThickness() {
 
 QSize preferredIconSize(float x) {
 	int s = qMax<int>(8, qRound(fontHeight() * x));
+#ifdef Q_OS_MACOS
+	s /= 1.25;
+#endif
 	return QSize(s, s);
 }