Windows build fix, Qt4 build fix.

This commit is contained in:
Matthias Koefferlein 2020-11-22 16:20:18 +01:00
parent be5fd1cd0e
commit fd95dc6637
5 changed files with 11 additions and 12 deletions

View File

@ -174,9 +174,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>

View File

@ -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">

View File

@ -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);

View File

@ -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)
{

View File

@ -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