Skip to content
Permalink
Browse files
remove Qt 4.5 dependency
git-svn-id: http://svn.osgeo.org/qgis/trunk@12247 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 25, 2009
1 parent e351381 commit 9fceb43b9a57781d68f27f63ecf4c7cbf1a13d15
Showing with 8 additions and 0 deletions.
  1. +8 −0 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 );

0 comments on commit 9fceb43

Please sign in to comment.