[QGIS Commit] r12691 - in trunk/qgis/src: app/composer core/composer

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-07 11:32:35 -0500 (Thu, 07 Jan 2010)
New Revision: 12691

Modified:
   trunk/qgis/src/app/composer/qgscomposertablewidget.cpp
   trunk/qgis/src/core/composer/qgscomposertable.h
Log:
fix windows build

Modified: trunk/qgis/src/app/composer/qgscomposertablewidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposertablewidget.cpp	2010-01-07 14:59:27 UTC (rev 12690)
+++ trunk/qgis/src/app/composer/qgscomposertablewidget.cpp	2010-01-07 16:32:35 UTC (rev 12691)
@@ -185,7 +185,11 @@
     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;

Modified: trunk/qgis/src/core/composer/qgscomposertable.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposertable.h	2010-01-07 14:59:27 UTC (rev 12690)
+++ trunk/qgis/src/core/composer/qgscomposertable.h	2010-01-07 16:32:35 UTC (rev 12691)
@@ -25,7 +25,7 @@
 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 );