Skip to content

Commit 83065a4

Browse files
borysiastyborysiasty
committedOct 25, 2018
Merge branch 'master' of github.com:qgis/QGIS into scale_lock_button
·
ltr-3_40final-3_4_0
2 parents 8bee898 + dc334ac commit 83065a4

File tree

56 files changed

+1081
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1081
-192
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ qgis.kdev4
5252
qgis.supp
5353
qgis-test.ctest
5454
qtcreator-build/
55+
resources/themes/*/style.qss.auto
5556
scripts/astyle.exe
5657
scripts/Debug
5758
scripts/qgisstyle*

‎python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ preview result and for populating the list of available functions and variables.
198198
void registerItem( const QString &group, const QString &label, const QString &expressionText,
199199
const QString &helpText = QString(),
200200
QgsExpressionItem::ItemType type = QgsExpressionItem::ExpressionNode,
201-
bool highlightedItem = false, int sortOrder = 1 );
201+
bool highlightedItem = false, int sortOrder = 1,
202+
QIcon icon = QIcon() );
202203
%Docstring
203204
Registers a node item for the expression builder.
204205

@@ -209,6 +210,7 @@ Registers a node item for the expression builder.
209210
:param type: The type of the expression item.
210211
:param highlightedItem: set to true to make the item highlighted, which inserts a bold copy of the item at the top level
211212
:param sortOrder: sort ranking for item
213+
:param icon: custom icon to show for item
212214
%End
213215

214216
bool isExpressionValid();

0 commit comments

Comments
 (0)
Please sign in to comment.