Skip to content

Commit 26c41b6

Browse files
author
jef
committed
remove more Qt 4.5 dependencies
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13209 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent a9eb65d commit 26c41b6

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/app/qgsannotationwidget.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ void QgsAnnotationWidget::on_mFrameColorButton_clicked()
107107
return;
108108
}
109109

110+
#if QT_VERSION >= 0x040500
110111
QColor c = QColorDialog::getColor( mFrameColorButton->color(), 0, tr( "Select frame color" ), QColorDialog::ShowAlphaChannel );
112+
#else
113+
QColor c = QColorDialog::getColor( mFrameColorButton->color() );
114+
#endif
111115
if ( c.isValid() )
112116
{
113117
mFrameColorButton->setColor( c );

src/app/qgstextannotationdialog.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ void QgsTextAnnotationDialog::changeCurrentFormat()
103103

104104
void QgsTextAnnotationDialog::on_mFontColorButton_clicked()
105105
{
106+
#if QT_VERSION >= 0x040500
106107
QColor newColor = QColorDialog::getColor( mFontColorButton->color(), 0, tr( "Select font color" ), QColorDialog::ShowAlphaChannel );
108+
#else
109+
QColor newColor = QColorDialog::getColor( mFontColorButton->arrowColor() );
110+
#endif
107111
if ( !newColor.isValid() )
108112
{
109113
return; //dialog canceled

0 commit comments

Comments
 (0)