Skip to content

Commit ec88c9d

Browse files
committedAug 16, 2012
nightly build fixes:
- QLineEdit::setPlaceholderText only available >= Qt 4.7 - debian packaging for symbology-ng-style update
1 parent cc217e1 commit ec88c9d

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed
 

‎debian/changelog‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
33
* new development version 1.9 after branch of 1.8
44
* include ows provider
55
* include wcs provider
6+
* symbology-ng-style now in sqlite3
67

7-
-- Jürgen E. Fischer <jef@norbit.de> Wed, 08 Aug 2012 08:49:52 +0200
8+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 Aug 2012 09:47:52 +0200
89

910
qgis (1.8.0) UNRELEASED; urgency=low
1011

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
usr/share/qgis/svg/*
22
usr/share/qgis/resources/qgis.db
33
usr/share/qgis/resources/srs.db
4-
usr/share/qgis/resources/symbology-ng-style.xml
4+
usr/share/qgis/resources/symbology-ng-style.db

‎src/gui/symbology-ng/qgsstylev2managerdialog.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
5353
#if QT_VERSION >= 0x40500
5454
tabItemType->setDocumentMode( true );
5555
#endif
56+
#if QT_VERSION >= 0x40700
57+
searchBox->setPlaceholderText( tr( "Type here to filter symbols ..." ) );
58+
#else
59+
searchBox->setToolTip( tr( "Type here to filter symbols ..." ) );
60+
#endif
5661

5762
// setup icons
5863
btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );

‎src/ui/qgsstylev2managerdialogbase.ui‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@
9797
<property name="text">
9898
<string/>
9999
</property>
100-
<property name="placeholderText">
101-
<string>Type here to filter symbols ...</string>
102-
</property>
103100
</widget>
104101
</item>
105102
<item row="1" column="1" colspan="2">

0 commit comments

Comments
 (0)
Please sign in to comment.