Skip to content

Commit 2a6629e

Browse files
committedApr 2, 2019
fix build (followup 7674e16)
1 parent 7e23f4d commit 2a6629e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎src/core/processing/qgsprocessingfeedback.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void QgsProcessingFeedback::pushVersionInfo()
6767

6868
#if PROJ_VERSION_MAJOR > 4
6969
PJ_INFO info = proj_info();
70-
pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
70+
pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH ) );
7171
#else
7272
pushDebugInfo( tr( "PROJ version: %1" ).arg( PJ_VERSION ) );
7373
#endif

4 commit comments

Comments
 (4)

nirvn commented on Apr 2, 2019

@nirvn
Contributor

@jef-n , there's also a unused variable build warning for PJ_INFO info = proj_info();.

jef-n commented on Apr 2, 2019

@jef-n
MemberAuthor

should probably be tr( "PROJ version: %1" ).arg( info.release ) instead of tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH ) like in tests/src/core/testqgscoordinatereferencesystem.cpp:127

pblottiere commented on Apr 2, 2019

@pblottiere
Member

Compilation is failing here:

../src/core/processing/qgsprocessingfeedback.cpp: In member function ‘void QgsProcessingFeedback::pushVersionInfo()’:
../src/core/processing/qgsprocessingfeedback.cpp:70:126: error: expected ‘)’ before ‘;’ token
   pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
                ~                                                                                                             ^
                                                                                                                              )
[316/5017] Building CXX object src/core/CMakeFiles/qgis_core.dir/expression/qgsexpressionfunction.cpp.o

should probably be tr( "PROJ version: %1" ).arg( info.release ) instead of tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH )

You're right @jef-n, the compilation is fixed this way. I'm doing a PR for that.

Thanks!

pblottiere commented on Apr 2, 2019

@pblottiere
Member

@jef-n Argh, I didn't see that your last commit fixed the build, sorry for the noise... But I'll propose a PR with tr( "PROJ version: %1" ).arg( info.release ) to avoid the warning about info.

Please sign in to comment.