Skip to content

Commit

Permalink
Fix failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 11, 2016
1 parent 8b28c04 commit 8779091
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion python/core/qgspallabeling.sip
Expand Up @@ -467,8 +467,9 @@ class QgsPalLayerSettings
/** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/
QVector< QgsPalLayerSettings::PredefinedPointPosition > predefinedPositionOrder;
//QVector< QgsPalLayerSettings::PredefinedPointPosition > predefinedPositionOrder;

/** True if only labels which completely fit within a polygon are allowed.
*/
Expand Down
1 change: 1 addition & 0 deletions src/core/qgspallabeling.h
Expand Up @@ -456,6 +456,7 @@ class CORE_EXPORT QgsPalLayerSettings
/** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/
QVector< PredefinedPointPosition > predefinedPositionOrder;

Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/testdata/labeling/pal_features_v3.sqlite
Binary file not shown.

0 comments on commit 8779091

Please sign in to comment.