Skip to content
Permalink
Browse files
Fix build
  • Loading branch information
m-kuhn committed May 19, 2017
1 parent ad7ce98 commit b0bb8733600c06cb7a5db3cd38ec447b60f6f0f0
@@ -106,7 +106,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/processing
${CMAKE_SOURCE_DIR}/src/core/providers
@@ -123,6 +122,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/locator
${CMAKE_SOURCE_DIR}/src/plugins

${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
@@ -137,10 +137,10 @@ Takes ownership of the provided node
:rtype: list of str
%End

NodeList *clone() const;
QgsExpressionNode::NodeList *clone() const;
%Docstring
Creates a deep copy of this list. Ownership is transferred to the caller
:rtype: NodeList
:rtype: QgsExpressionNode.NodeList
%End

virtual QString dump() const;
@@ -208,44 +208,45 @@ class QgsFeatureRequest
%End
public:

CORE_EXPORT OrderBy();
OrderBy();
%Docstring
Create a new empty order by
:rtype: CORE_EXPORT
%End

CORE_EXPORT OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
%Docstring
Create a new order by from a list of clauses
:rtype: CORE_EXPORT
%End

QList<QgsFeatureRequest::OrderByClause> CORE_EXPORT list() const;
QList<QgsFeatureRequest::OrderByClause> list() const;
%Docstring
Get a copy as a list of OrderByClauses

This is only required in Python where the inheritance
is not properly propagated and this makes it usable.
:rtype: list of QgsFeatureRequest.OrderByClause
%End

void save( QDomElement &elem ) const;
void save( QDomElement &elem ) const;
%Docstring
Serialize to XML
%End

void load( const QDomElement &elem );
void load( const QDomElement &elem );
%Docstring
Deserialize from XML
%End

QSet<QString> usedAttributes() const;
QSet<QString> usedAttributes() const;
%Docstring
Returns a set of used attributes
:rtype: set of str
%End

QString dump() const;
QString dump() const;
%Docstring
Dumps the content to an SQL equivalent syntax
:rtype: str
%End
};

@@ -485,6 +485,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/app/openstreetmap
${CMAKE_SOURCE_DIR}/src/app/dwg
${CMAKE_SOURCE_DIR}/src/app/dwg/libdxfrw
${CMAKE_SOURCE_DIR}/src/app/locator
${CMAKE_SOURCE_DIR}/src/analysis/raster
${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
${CMAKE_SOURCE_DIR}/src/core
@@ -497,7 +498,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/providers/memory
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
@@ -510,6 +510,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/locator
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/src/python
${CMAKE_SOURCE_DIR}/src/native
@@ -143,7 +143,7 @@ class CORE_EXPORT QgsExpressionNode SIP_ABSTRACT
QStringList names() const { return mNameList; }

//! Creates a deep copy of this list. Ownership is transferred to the caller
NodeList *clone() const;
QgsExpressionNode::NodeList *clone() const;

virtual QString dump() const;

16 src/core/qgsfeaturerequest.h 100755 → 100644
@@ -215,49 +215,49 @@ class CORE_EXPORT QgsFeatureRequest
*
* \since QGIS 2.14
*/
class OrderBy : public QList<QgsFeatureRequest::OrderByClause>
class CORE_EXPORT OrderBy : public QList<QgsFeatureRequest::OrderByClause>

This comment has been minimized.

Copy link
@3nids

3nids May 19, 2017

Member

@m-kuhn see 1d5d92e

if this is again reverted, there is an issue with sipify which does not handle code like this at the moment.
I can fix this but I wonder if it's the appropriate way to fix windows build.

This comment has been minimized.

Copy link
@m-kuhn

m-kuhn May 19, 2017

Author Member

Hard to tell without the error message of a failing windows build at hand

CC @jef-n

{
public:

/**
* Create a new empty order by
*/
CORE_EXPORT OrderBy()
OrderBy()
: QList<QgsFeatureRequest::OrderByClause>()
{}

/**
* Create a new order by from a list of clauses
*/
CORE_EXPORT OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );

/**
* Get a copy as a list of OrderByClauses
*
* This is only required in Python where the inheritance
* is not properly propagated and this makes it usable.
*/
QList<QgsFeatureRequest::OrderByClause> CORE_EXPORT list() const;
QList<QgsFeatureRequest::OrderByClause> list() const;

/**
* Serialize to XML
*/
void CORE_EXPORT save( QDomElement &elem ) const;
void save( QDomElement &elem ) const;

/**
* Deserialize from XML
*/
void CORE_EXPORT load( const QDomElement &elem );
void load( const QDomElement &elem );

/**
* Returns a set of used attributes
*/
QSet<QString> CORE_EXPORT usedAttributes() const;
QSet<QString> usedAttributes() const;

/**
* Dumps the content to an SQL equivalent syntax
*/
QString CORE_EXPORT dump() const;
QString dump() const;
};

/**

0 comments on commit b0bb873

Please sign in to comment.