Skip to content

Commit 0644f59

Browse files
3nids3nids
committedJan 17, 2018
fix variable used for configuration
·
ltr-3_40final-3_0_0
1 parent 4a0eedd commit 0644f59

File tree

4 files changed

+27
-29
lines changed

4 files changed

+27
-29
lines changed
 

‎cmake/SIPMacros.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
6161
FILE(RELATIVE_PATH _sip_file_relpath ${CMAKE_CURRENT_SOURCE_DIR} "${_sip_file_path}/${_sip_file_name_we}")
6262
SET(_out_sip_file "${CMAKE_CURRENT_BINARY_DIR}/${_sip_file_relpath}.sip")
6363
CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
64-
MESSAGE(${_sip_file})
65-
MESSAGE(${_out_sip_file})
6664
ENDFOREACH (_sip_file)
6765

6866

‎python/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
175175
# * prepend auto-generated Python signature to existing Docstrings
176176
# * document template based classes
177177
SET(DOCSTRINGSTEMPLATE "//")
178-
IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
178+
IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
179179
SET(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"")
180180
SET(DOCSTRINGSTEMPLATE "")
181-
ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
181+
ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
182182

183183
# core module
184184
FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in)

‎python/core/qgsrange.sip.in

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -247,32 +247,32 @@ Returns true if this range overlaps another range.
247247

248248

249249
typedef QgsTemporalRange< QDate > QgsDateRange;
250-
@TEMPLATE_DOCSTRING@%Docstring
251-
@TEMPLATE_DOCSTRING@QgsRange which stores a range of dates.
252-
@TEMPLATE_DOCSTRING@
253-
@TEMPLATE_DOCSTRING@Invalid QDates as the beginning or end are permitted. In this case,
254-
@TEMPLATE_DOCSTRING@the bound is considered to be infinite. E.g. QgsDateRange(QDate(),QDate(2017,1,1))
255-
@TEMPLATE_DOCSTRING@is treated as a range containing all dates before 2017-1-1.
256-
@TEMPLATE_DOCSTRING@QgsDateRange(QDate(2017,1,1),QDate()) is treated as a range containing all dates after 2017-1-1.
257-
@TEMPLATE_DOCSTRING@
258-
@TEMPLATE_DOCSTRING@.. versionadded:: 3.0
259-
@TEMPLATE_DOCSTRING@
260-
@TEMPLATE_DOCSTRING@.. seealso:: :py:class:`QgsDateTimeRange`
261-
@TEMPLATE_DOCSTRING@%End
250+
@DOCSTRINGSTEMPLATE@%Docstring
251+
@DOCSTRINGSTEMPLATE@QgsRange which stores a range of dates.
252+
@DOCSTRINGSTEMPLATE@
253+
@DOCSTRINGSTEMPLATE@Invalid QDates as the beginning or end are permitted. In this case,
254+
@DOCSTRINGSTEMPLATE@the bound is considered to be infinite. E.g. QgsDateRange(QDate(),QDate(2017,1,1))
255+
@DOCSTRINGSTEMPLATE@is treated as a range containing all dates before 2017-1-1.
256+
@DOCSTRINGSTEMPLATE@QgsDateRange(QDate(2017,1,1),QDate()) is treated as a range containing all dates after 2017-1-1.
257+
@DOCSTRINGSTEMPLATE@
258+
@DOCSTRINGSTEMPLATE@.. versionadded:: 3.0
259+
@DOCSTRINGSTEMPLATE@
260+
@DOCSTRINGSTEMPLATE@.. seealso:: :py:class:`QgsDateTimeRange`
261+
@DOCSTRINGSTEMPLATE@%End
262262

263263
typedef QgsTemporalRange< QDateTime > QgsDateTimeRange;
264-
@TEMPLATE_DOCSTRING@%Docstring
265-
@TEMPLATE_DOCSTRING@QgsRange which stores a range of date times.
266-
@TEMPLATE_DOCSTRING@
267-
@TEMPLATE_DOCSTRING@Invalid QDateTimes as the beginning or end are permitted. In this case,
268-
@TEMPLATE_DOCSTRING@the bound is considered to be infinite. E.g. QgsDateTimeRange(QDateTime(),QDateTime(2017,1,1))
269-
@TEMPLATE_DOCSTRING@is treated as a range containing all dates before 2017-1-1.
270-
@TEMPLATE_DOCSTRING@QgsDateTimeRange(QDateTime(2017,1,1),QDateTime()) is treated as a range containing all dates after 2017-1-1.
271-
@TEMPLATE_DOCSTRING@
272-
@TEMPLATE_DOCSTRING@.. versionadded:: 3.0
273-
@TEMPLATE_DOCSTRING@
274-
@TEMPLATE_DOCSTRING@.. seealso:: :py:class:`QgsDateRange`
275-
@TEMPLATE_DOCSTRING@%End
264+
@DOCSTRINGSTEMPLATE@%Docstring
265+
@DOCSTRINGSTEMPLATE@QgsRange which stores a range of date times.
266+
@DOCSTRINGSTEMPLATE@
267+
@DOCSTRINGSTEMPLATE@Invalid QDateTimes as the beginning or end are permitted. In this case,
268+
@DOCSTRINGSTEMPLATE@the bound is considered to be infinite. E.g. QgsDateTimeRange(QDateTime(),QDateTime(2017,1,1))
269+
@DOCSTRINGSTEMPLATE@is treated as a range containing all dates before 2017-1-1.
270+
@DOCSTRINGSTEMPLATE@QgsDateTimeRange(QDateTime(2017,1,1),QDateTime()) is treated as a range containing all dates after 2017-1-1.
271+
@DOCSTRINGSTEMPLATE@
272+
@DOCSTRINGSTEMPLATE@.. versionadded:: 3.0
273+
@DOCSTRINGSTEMPLATE@
274+
@DOCSTRINGSTEMPLATE@.. seealso:: :py:class:`QgsDateRange`
275+
@DOCSTRINGSTEMPLATE@%End
276276

277277
/************************************************************************
278278
* This file has been generated automatically from *

‎scripts/sipify.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ sub detect_non_method_member{
10531053
dbg_info('writing comment');
10541054
if ( $COMMENT !~ m/^\s*$/ ){
10551055
my $doc_prepend = "";
1056-
$doc_prepend = "\@TEMPLATE_DOCSTRING\@" if $COMMENT_TEMPLATE_DOCSTRING == 1;
1056+
$doc_prepend = "\@DOCSTRINGSTEMPLATE\@" if $COMMENT_TEMPLATE_DOCSTRING == 1;
10571057
write_output("CM1", "$doc_prepend%Docstring\n");
10581058
my @comment_lines = split /\n/, $COMMENT;
10591059
foreach my $comment_line (@comment_lines) {

0 commit comments

Comments
 (0)
Please sign in to comment.