comparison 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)

                 (LayerFactory::getInstance()->getLayerType(layer));
         }
 
         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));
 	if (icon.isNull()) {
 	    addTab(box, shortName);
 	} else {
 	    addTab(box, icon, QString("&%1").arg(i + 1));
 	    setTabToolTip(i, name);
 	}
-
-#endif
 
 	m_boxes.push_back(box);
     }    
 
     blockSignals(false);