remove Qt 4.5 dependency

jef · jef · commit 9fceb43b9a57 · 2009-11-25T10:00:05.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12247 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposershapewidget.cpp b/src/app/composer/qgscomposershapewidget.cpp
@@ -126,7 +126,11 @@ void QgsComposerShapeWidget::on_mOutlineColorButton_clicked()
     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 @@ void QgsComposerShapeWidget::on_mFillColorButton_clicked()
     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 );

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,11 @@ void QgsComposerShapeWidget::on_mOutlineColorButton_clicked()`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`	`QColor existingColor = mComposerShape->outlineColor();`
	`129`	`+#if QT_VERSION >= 0x040500`
`129`	`130`	`QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select outline color" ), QColorDialog::ShowAlphaChannel );`
	`131`	`+#else`
	`132`	`+ QColor newColor = QColorDialog::getColor( existingColor );`
	`133`	`+#endif`
`130`	`134`	`if ( newColor.isValid() )`
`131`	`135`	`{`
`132`	`136`	`mComposerShape->setOutlineColor( newColor );`
`@@ -171,7 +175,11 @@ void QgsComposerShapeWidget::on_mFillColorButton_clicked()`
`171`	`175`	`return;`
`172`	`176`	`}`
`173`	`177`	`QColor existingColor = mComposerShape->fillColor();`
	`178`	`+#if QT_VERSION >= 0x040500`
`174`	`179`	`QColor newColor = QColorDialog::getColor( existingColor, 0, tr( "Select fill color" ), QColorDialog::ShowAlphaChannel );`
	`180`	`+#else`
	`181`	`+ QColor newColor = QColorDialog::getColor( existingColor );`
	`182`	`+#endif`
`175`	`183`	`if ( newColor.isValid() )`
`176`	`184`	`{`
`177`	`185`	`mComposerShape->setFillColor( newColor );`