From ec88c9d53abd768657afcf2dad9f309c6d270131 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Thu, 16 Aug 2012 09:51:00 +0200
Subject: [PATCH] nightly build fixes: - QLineEdit::setPlaceholderText only
 available >= Qt 4.7 - debian packaging for symbology-ng-style update

---
 debian/changelog                                 | 3 ++-
 debian/qgis-providers-common.install             | 2 +-
 src/gui/symbology-ng/qgsstylev2managerdialog.cpp | 5 +++++
 src/ui/qgsstylev2managerdialogbase.ui            | 3 ---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c53f5a0558..8b9dc058ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/qgis-providers-common.install b/debian/qgis-providers-common.install
index 91402e5ebd6..495e1ef49c2 100644
--- a/debian/qgis-providers-common.install
+++ b/debian/qgis-providers-common.install
@@ -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
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
index 0a4924023c2..1c7465a7f79 100644
--- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
+++ b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -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" ) ) );
diff --git a/src/ui/qgsstylev2managerdialogbase.ui b/src/ui/qgsstylev2managerdialogbase.ui
index 56a8f91968e..b64e1b7e6d6 100644
--- a/src/ui/qgsstylev2managerdialogbase.ui
+++ b/src/ui/qgsstylev2managerdialogbase.ui
@@ -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">