[QGIS Commit] r12247 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-11-25 05:00:05 -0500 (Wed, 25 Nov 2009)
New Revision: 12247

Modified:
   trunk/qgis/src/app/composer/qgscomposershapewidget.cpp
Log:
remove Qt 4.5 dependency

Modified: trunk/qgis/src/app/composer/qgscomposershapewidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposershapewidget.cpp	2009-11-25 09:25:53 UTC (rev 12246)
+++ trunk/qgis/src/app/composer/qgscomposershapewidget.cpp	2009-11-25 10:00:05 UTC (rev 12247)
@@ -126,7 +126,11 @@
     return;
   }
   QColor existingColor = mComposerShape->outlineColor();
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select outline color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( existingColor );
+#endif
   if ( newColor.isValid() )
   {
     mComposerShape->setOutlineColor( newColor );
@@ -171,7 +175,11 @@
     return;
   }
   QColor existingColor = mComposerShape->fillColor();
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select fill color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( existingColor );
+#endif
   if ( newColor.isValid() )
   {
     mComposerShape->setFillColor( newColor );