diff widgets/PropertyStack.cpp @ 1216:dc2af6616c83

Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:50 +0000
parents 3f5c82034f9b
children a34a2a25907c
line wrap: on
line diff
--- a/widgets/PropertyStack.cpp	Fri Mar 04 12:23:31 2016 +0000
+++ b/widgets/PropertyStack.cpp	Fri Jan 13 10:29:50 2017 +0000
@@ -25,6 +25,8 @@
 #include "widgets/CommandHistory.h"
 #include "layer/ShowLayerCommand.h"
 
+#include "WidgetScale.h"
+
 #include <QIcon>
 #include <QTabWidget>
 
@@ -45,12 +47,10 @@
 
     setTabBar(bar);
 
-#if (QT_VERSION >= 0x0402)
     setElideMode(Qt::ElideNone); 
     tabBar()->setUsesScrollButtons(true); 
-    tabBar()->setIconSize(QSize(16, 16));
-#endif
-    
+    tabBar()->setIconSize(WidgetScale::scaleQSize(QSize(16, 16)));
+
     repopulate();
 
     connect(this, SIGNAL(currentChanged(int)),