[QGIS Commit] r13209 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-03-31 09:37:35 -0400 (Wed, 31 Mar 2010)
New Revision: 13209

Modified:
   trunk/qgis/src/app/qgsannotationwidget.cpp
   trunk/qgis/src/app/qgstextannotationdialog.cpp
Log:
remove more Qt 4.5 dependencies

Modified: trunk/qgis/src/app/qgsannotationwidget.cpp
===================================================================
--- trunk/qgis/src/app/qgsannotationwidget.cpp	2010-03-31 13:32:24 UTC (rev 13208)
+++ trunk/qgis/src/app/qgsannotationwidget.cpp	2010-03-31 13:37:35 UTC (rev 13209)
@@ -107,7 +107,11 @@
     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 );

Modified: trunk/qgis/src/app/qgstextannotationdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgstextannotationdialog.cpp	2010-03-31 13:32:24 UTC (rev 13208)
+++ trunk/qgis/src/app/qgstextannotationdialog.cpp	2010-03-31 13:37:35 UTC (rev 13209)
@@ -103,7 +103,11 @@
 
 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