fix windows build

jef · jef · commit e989c1e989b6 · 2010-01-07T16:32:35.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12691 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
@@ -185,7 +185,11 @@ void QgsComposerTableWidget::on_mGridColorButton_clicked()
     return;
   }
 
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mComposerTable->gridColor(), 0, tr( "Select grid color" ) );
+#else
+  QColor newColor = QColorDialog::getColor( mComposerTable->gridColor(), 0 );
+#endif
   if ( !newColor.isValid() )
   {
     return;
diff --git a/src/core/composer/qgscomposertable.h b/src/core/composer/qgscomposertable.h
@@ -25,7 +25,7 @@ class QgsComposerMap;
 class QgsVectorLayer;
 
 /**A class to display feature attributes in the print composer*/
-class QgsComposerTable: public QgsComposerItem
+class CORE_EXPORT QgsComposerTable: public QgsComposerItem
 {
   public:
     QgsComposerTable( QgsComposition* composition );

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,11 @@ void QgsComposerTableWidget::on_mGridColorButton_clicked()`
`185`	`185`	`return;`
`186`	`186`	`}`
`187`	`187`
	`188`	`+#if QT_VERSION >= 0x040500`
`188`	`189`	`QColor newColor = QColorDialog::getColor( mComposerTable->gridColor(), 0, tr( "Select grid color" ) );`
	`190`	`+#else`
	`191`	`+ QColor newColor = QColorDialog::getColor( mComposerTable->gridColor(), 0 );`
	`192`	`+#endif`
`189`	`193`	`if ( !newColor.isValid() )`
`190`	`194`	`{`
`191`	`195`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class QgsComposerMap;`
`25`	`25`	`class QgsVectorLayer;`
`26`	`26`
`27`	`27`	`/*A class to display feature attributes in the print composer/`
`28`		`-class QgsComposerTable: public QgsComposerItem`
	`28`	`+class CORE_EXPORT QgsComposerTable: public QgsComposerItem`
`29`	`29`	`{`
`30`	`30`	`public:`
`31`	`31`	`QgsComposerTable( QgsComposition* composition );`