remove more Qt 4.5 dependencies

jef · jef · commit 26c41b60e548 · 2010-03-31T13:37:35.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13209 c8812cc2-4d05-0410-92ff-de0c093fc19c
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

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,11 @@ void QgsAnnotationWidget::on_mFrameColorButton_clicked()`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`	`109`
	`110`	`+#if QT_VERSION >= 0x040500`
`110`	`111`	`QColor c = QColorDialog::getColor( mFrameColorButton->color(), 0, tr( "Select frame color" ), QColorDialog::ShowAlphaChannel );`
	`112`	`+#else`
	`113`	`+ QColor c = QColorDialog::getColor( mFrameColorButton->color() );`
	`114`	`+#endif`
`111`	`115`	`if ( c.isValid() )`
`112`	`116`	`{`
`113`	`117`	`mFrameColorButton->setColor( c );`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,11 @@ void QgsTextAnnotationDialog::changeCurrentFormat()`
`103`	`103`
`104`	`104`	`void QgsTextAnnotationDialog::on_mFontColorButton_clicked()`
`105`	`105`	`{`
	`106`	`+#if QT_VERSION >= 0x040500`
`106`	`107`	`QColor newColor = QColorDialog::getColor( mFontColorButton->color(), 0, tr( "Select font color" ), QColorDialog::ShowAlphaChannel );`
	`108`	`+#else`
	`109`	`+ QColor newColor = QColorDialog::getColor( mFontColorButton->arrowColor() );`
	`110`	`+#endif`
`107`	`111`	`if ( !newColor.isValid() )`
`108`	`112`	`{`
`109`	`113`	`return; //dialog canceled`