diff --git a/debian/control.sid b/debian/control.sid index 08fe8422acb..b81048ab231 100644 --- a/debian/control.sid +++ b/debian/control.sid @@ -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 diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 57bb73ac723..eed0a0a6249 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -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 ); diff --git a/src/plugins/sqlanywhere/sasourceselectbase.ui b/src/plugins/sqlanywhere/sasourceselectbase.ui index 1199e6cfb05..8a43db13e46 100644 --- a/src/plugins/sqlanywhere/sasourceselectbase.ui +++ b/src/plugins/sqlanywhere/sasourceselectbase.ui @@ -178,7 +178,6 @@ btnEdit btnDelete mTablesTreeView - btnBuildQuery mSearchGroupBox mSearchTableEdit mSearchColumnComboBox