sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix nightly build

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15531 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2011-03-18 07:45:29 +00:00
parent a2020cbefa
commit 59cbd4fb24
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control.sid vendored
View File

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

8
src/app/qgsvectorlayerproperties.cpp
View File

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

1
src/plugins/sqlanywhere/sasourceselectbase.ui
View File

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