Skip to content

Commit

Permalink
remove Qt 4.5 dependency
Browse files Browse the repository at this point in the history
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 9fceb43
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/app/composer/qgscomposershapewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down

0 comments on commit 9fceb43

Please sign in to comment.