Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KItinerary
Commits
0e287b70
Commit
0e287b70
authored
Nov 06, 2020
by
Volker Krause
Browse files
Propagate ZXing version so we can do build-time checks with it
parent
da098b5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config-kitinerary.h.cmake
View file @
0e287b70
...
...
@@ -16,6 +16,11 @@
#define KPOPPLER_VERSION ((@POPPLER_VERSION_MAJOR@<<16)|(@POPPLER_VERSION_MINOR@<<8)|(@POPPLER_VERSION_PATCH@))
#cmakedefine HAVE_ZXING
#define ZXING_VERSION_STRING "@ZXing_VERSION@"
#define ZXING_VERSION_MAJOR @ZXing_VERSION_MAJOR@
#define ZXING_VERSION_MINOR @ZXing_VERSION_MINOR@
#define ZXING_VERSION_PATCH @ZXing_VERSION_PATCH@
#define ZXING_VERSION ((@ZXing_VERSION_MAJOR@<<16)|(@ZXing_VERSION_MINOR@<<8)|(@ZXing_VERSION_PATCH@))
#cmakedefine HAVE_KCAL
#cmakedefine HAVE_LIBXML2
...
...
src/extractorcapabilities.cpp
View file @
0e287b70
...
...
@@ -47,7 +47,7 @@ QString ExtractorCapabilities::capabilitiesString()
"Barcode decoder : "
#ifdef HAVE_ZXING
"zxing"
"zxing
("
ZXING_VERSION_STRING
")
"
#else
"not available"
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment