remove more Qt 4.5 dependencies

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13209 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 31, 2010 · 26c41b6 · 26c41b6
1 parent a9eb65d
commit 26c41b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp
@@ -107,7 +107,11 @@ void QgsAnnotationWidget::on_mFrameColorButton_clicked()
     return;
   }
 
+#if QT_VERSION >= 0x040500
   QColor c = QColorDialog::getColor( mFrameColorButton->color(), 0, tr( "Select frame color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor c = QColorDialog::getColor( mFrameColorButton->color() );
+#endif
   if ( c.isValid() )
   {
     mFrameColorButton->setColor( c );

diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp
@@ -103,7 +103,11 @@ void QgsTextAnnotationDialog::changeCurrentFormat()
 
 void QgsTextAnnotationDialog::on_mFontColorButton_clicked()
 {
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mFontColorButton->color(), 0, tr( "Select font color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( mFontColorButton->arrowColor() );
+#endif
   if ( !newColor.isValid() )
   {
     return; //dialog canceled