Skip to content
Permalink
Browse files

fix nightly build

git-svn-id: http://svn.osgeo.org/qgis/trunk@15531 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 18, 2011
1 parent a2020cb commit 59cbd4fb24a66da5731897849a64ef829b4bb229
Showing with 9 additions and 1 deletion.
  1. +1 −0 debian/control.sid
  2. +8 −0 src/app/qgsvectorlayerproperties.cpp
  3. +0 −1 src/plugins/sqlanywhere/sasourceselectbase.ui
@@ -31,6 +31,7 @@ Build-Depends:
python-sip-dev (>= 4.5.0),
subversion,
doxygen,
graphviz,
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
@@ -1512,7 +1512,11 @@ void QgsVectorLayerProperties::on_mFindMaximumValueButton_clicked()

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_mBackgroundColorButton_clicked()

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 );
@@ -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>

0 comments on commit 59cbd4f

Please sign in to comment.
You can’t perform that action at this time.