nightly build fixes:

- QLineEdit::setPlaceholderText only available >= Qt 4.7
- debian packaging for symbology-ng-style update
This commit is contained in:
Juergen E. Fischer 2012-08-16 09:51:00 +02:00
parent cc217e1ea4
commit ec88c9d53a
4 changed files with 8 additions and 5 deletions

3
debian/changelog vendored
View File

@ -3,8 +3,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* new development version 1.9 after branch of 1.8
* include ows provider
* include wcs provider
* symbology-ng-style now in sqlite3
-- Jürgen E. Fischer <jef@norbit.de> Wed, 08 Aug 2012 08:49:52 +0200
-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 Aug 2012 09:47:52 +0200
qgis (1.8.0) UNRELEASED; urgency=low

View File

@ -1,4 +1,4 @@
usr/share/qgis/svg/*
usr/share/qgis/resources/qgis.db
usr/share/qgis/resources/srs.db
usr/share/qgis/resources/symbology-ng-style.xml
usr/share/qgis/resources/symbology-ng-style.db

View File

@ -53,6 +53,11 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
#if QT_VERSION >= 0x40500
tabItemType->setDocumentMode( true );
#endif
#if QT_VERSION >= 0x40700
searchBox->setPlaceholderText( tr( "Type here to filter symbols ..." ) );
#else
searchBox->setToolTip( tr( "Type here to filter symbols ..." ) );
#endif
// setup icons
btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );

View File

@ -97,9 +97,6 @@
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Type here to filter symbols ...</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">