diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui
index 53002f9de..d7529a797 100644
--- a/src/edt/edt/EditorOptionsInst.ui
+++ b/src/edt/edt/EditorOptionsInst.ui
@@ -174,9 +174,6 @@
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
-               <property name="clearButtonEnabled">
-                <bool>false</bool>
-               </property>
               </widget>
              </item>
             </layout>
diff --git a/src/laybasic/laybasic/BrowserPanel.ui b/src/laybasic/laybasic/BrowserPanel.ui
index d77c6c45a..fd4afc7b0 100644
--- a/src/laybasic/laybasic/BrowserPanel.ui
+++ b/src/laybasic/laybasic/BrowserPanel.ui
@@ -232,11 +232,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QLineEdit" name="on_page_search_edit">
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
-               </property>
-              </widget>
+              <widget class="QLineEdit" name="on_page_search_edit"/>
              </item>
              <item>
               <widget class="QToolButton" name="search_close_button">
@@ -431,9 +427,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="clearButtonEnabled">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
    <item row="0" column="10">
diff --git a/src/laybasic/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc
index 3dd2393e2..98a39a445 100644
--- a/src/laybasic/laybasic/layBrowserPanel.cc
+++ b/src/laybasic/laybasic/layBrowserPanel.cc
@@ -110,6 +110,11 @@ BrowserPanel::init ()
   mp_ui = new Ui::BrowserPanel ();
   mp_ui->setupUi (this);
 
+#if QT_VERSION >= 0x050200
+  mp_ui->on_page_search_edit->setClearButtonEnabled (true);
+  mp_ui->search_edit->setClearButtonEnabled (true);
+#endif
+
   mp_ui->browser->setReadOnly (true);
   mp_ui->browser->set_panel (this);
   mp_ui->browser->setWordWrapMode (QTextOption::WordWrap);
@@ -147,7 +152,9 @@ BrowserPanel::init ()
   connect (mp_ui->browser_bookmark_view, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)), this, SLOT (bookmark_item_selected (QTreeWidgetItem *)));
 
   mp_completer = new QCompleter (this);
+#if QT_VERSION >= 0x050200
   mp_completer->setFilterMode (Qt::MatchStartsWith);
+#endif
   mp_completer->setCaseSensitivity (Qt::CaseInsensitive);
   mp_completer->setCompletionMode (QCompleter::UnfilteredPopupCompletion);
   mp_completer_model = new QStringListModel (mp_completer);
diff --git a/src/laybasic/laybasic/layLayerTreeModel.cc b/src/laybasic/laybasic/layLayerTreeModel.cc
index 4ee8b9bb6..c622bf5e4 100644
--- a/src/laybasic/laybasic/layLayerTreeModel.cc
+++ b/src/laybasic/laybasic/layLayerTreeModel.cc
@@ -559,6 +559,7 @@ LayerTreeModel::empty_within_view_predicate (const QModelIndex &index) const
   }
 }
 
+LAYBASIC_PUBLIC
 QIcon
 LayerTreeModel::icon_for_layer (const lay::LayerPropertiesConstIterator &iter, lay::LayoutView *view, unsigned int w, unsigned int h, unsigned int di_off, bool no_state)
 {
diff --git a/src/laybasic/laybasic/layLayerTreeModel.h b/src/laybasic/laybasic/layLayerTreeModel.h
index 852184ab1..b63377e40 100644
--- a/src/laybasic/laybasic/layLayerTreeModel.h
+++ b/src/laybasic/laybasic/layLayerTreeModel.h
@@ -25,6 +25,7 @@
 #define HDR_layLayerTreeModel
 
 #include "dbBox.h"
+#include "laybasicCommon.h"
 
 #include <vector>
 #include <set>
@@ -77,7 +78,7 @@ private:
  *  representation or a hierarchical one.
  */
 
-class LayerTreeModel 
+class LAYBASIC_PUBLIC LayerTreeModel
   : public QAbstractItemModel
 {
 Q_OBJECT