diff widgets/PropertyStack.cpp @ 373:0895517bb2d1 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 226cb289bdf4
children
line wrap: on
line diff
--- a/widgets/PropertyStack.cpp	Thu Nov 29 10:43:54 2007 +0000
+++ b/widgets/PropertyStack.cpp	Wed Feb 27 10:32:45 2008 +0000
@@ -114,17 +114,6 @@
 
         shortName = QString("&%1 %2").arg(i + 1).arg(shortName);
 
-#ifdef Q_WS_MAC
-
-        // Qt 4.2 on OS/X doesn't show the icons in the tab bar, and
-        // I'm not sure why -- use labels instead
-
-        addTab(box, shortName);
-        
-#else
-
-        // Icons on other platforms
-
 	QString iconName = container->getPropertyContainerIconName();
 
         QIcon icon(IconLoader().load(iconName));
@@ -135,8 +124,6 @@
 	    setTabToolTip(i, name);
 	}
 
-#endif
-
 	m_boxes.push_back(box);
     }