status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iconv.h defined only for win32 builds so win build for another platforms must define NO_ICONV

This commit is contained in:
Alexxey593 2015-06-11 12:10:54 +03:00
parent 0c8b8fbdad
commit 362ecdba51
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/QZXing.pri
View File

@ -1,7 +1,7 @@
QT += core gui QT += core gui
greaterThan(QT_VERSION, 4.7): QT += declarative greaterThan(QT_VERSION, 4.7): lessThan(QT_VERSION, 5.0): QT += declarative
greaterThan(QT_VERSION, 5.0): QT += quick greaterThan(QT_MAJOR_VERSION, 4): QT += quick
DEFINES += QZXING_LIBRARY \ DEFINES += QZXING_LIBRARY \
ZXING_ICONV_CONST \ ZXING_ICONV_CONST \
@ -283,3 +283,7 @@ win32-g++{
SOURCES += $$PWD/zxing/win32/zxing/win_iconv.c SOURCES += $$PWD/zxing/win32/zxing/win_iconv.c
} }
!win32{
DEFINES += NO_ICONV
}

1
source/qzxing.cpp
View File

@ -180,7 +180,6 @@ QString QZXing::decodeImage(QImage &image, int maxWidth, int maxHeight, bool smo
if(image.isNull()) if(image.isNull())
{ {
qDebug() << "Image is Null";
emit decodingFinished(false); emit decodingFinished(false);
processingTime = t.elapsed(); processingTime = t.elapsed();
return ""; return "";