Fix for bug #2617

mhugent · mhugent · commit 09691ba3881a · 2010-04-01T12:53:58.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13220 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp
@@ -106,7 +106,7 @@ 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() );
+  QColor newColor = QColorDialog::getColor( mFontColorButton->color() );
 #endif
   if ( !newColor.isValid() )
   {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void QgsTextAnnotationDialog::on_mFontColorButton_clicked()`
`106`	`106`	`#if QT_VERSION >= 0x040500`
`107`	`107`	`QColor newColor = QColorDialog::getColor( mFontColorButton->color(), 0, tr( "Select font color" ), QColorDialog::ShowAlphaChannel );`
`108`	`108`	`#else`
`109`		`- QColor newColor = QColorDialog::getColor( mFontColorButton->arrowColor() );`
	`109`	`+ QColor newColor = QColorDialog::getColor( mFontColorButton->color() );`
`110`	`110`	`#endif`
`111`	`111`	`if ( !newColor.isValid() )`
`112`	`112`	`{`