[QGIS Commit] r15531 - in trunk/qgis: debian src/app src/plugins/sqlanywhere

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-18 00:45:29 -0700 (Fri, 18 Mar 2011)
New Revision: 15531

Modified:
   trunk/qgis/debian/control.sid
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui
Log:
fix nightly build

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2011-03-17 21:42:27 UTC (rev 15530)
+++ trunk/qgis/debian/control.sid	2011-03-18 07:45:29 UTC (rev 15531)
@@ -31,6 +31,7 @@
  python-sip-dev (>= 4.5.0),
  subversion,
  doxygen,
+ graphviz,
  txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-17 21:42:27 UTC (rev 15530)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-18 07:45:29 UTC (rev 15531)
@@ -1512,7 +1512,11 @@
 
 void QgsVectorLayerProperties::on_mBackgroundColorButton_clicked()
 {
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mBackgroundColorButton->color(), 0, tr( "Background color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( mBackgroundColorButton->color() );
+#endif
   if ( newColor.isValid() )
   {
     mBackgroundColorButton->setColor( newColor );
@@ -1521,7 +1525,11 @@
 
 void QgsVectorLayerProperties::on_mDiagramPenColorButton_clicked()
 {
+#if QT_VERSION >= 0x040500
   QColor newColor = QColorDialog::getColor( mDiagramPenColorButton->color(), 0, tr( "Pen color" ), QColorDialog::ShowAlphaChannel );
+#else
+  QColor newColor = QColorDialog::getColor( mDiagramPenColorButton->color() );
+#endif
   if ( newColor.isValid() )
   {
     mDiagramPenColorButton->setColor( newColor );

Modified: trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui	2011-03-17 21:42:27 UTC (rev 15530)
+++ trunk/qgis/src/plugins/sqlanywhere/sasourceselectbase.ui	2011-03-18 07:45:29 UTC (rev 15531)
@@ -178,7 +178,6 @@
   <tabstop>btnEdit</tabstop>
   <tabstop>btnDelete</tabstop>
   <tabstop>mTablesTreeView</tabstop>
-  <tabstop>btnBuildQuery</tabstop>
   <tabstop>mSearchGroupBox</tabstop>
   <tabstop>mSearchTableEdit</tabstop>
   <tabstop>mSearchColumnComboBox</tabstop>