diff --git a/.gitignore b/.gitignore
index b62b821..f4f5c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,9 @@ Makefile
 *.user
 *.mmp
 *.pkg
-QZXing-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Debug/
-QZXing-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Release/
-build-QZXingTestApp-Desktop_Qt_5_2_0_GCC_64bit-Debug
-build-QZXing-Desktop_Qt_5_2_0_GCC_64bit-Debug
+QZXing-build-*
+build-*
+*.Debug
+*.Release
+debug/
+*.pdb
diff --git a/examples/QZXingDragNDropTest/QZXingTestApp.pro b/examples/QZXingDragNDropTest/QZXingTestApp.pro
index 3994202..1ba10ba 100644
--- a/examples/QZXingDragNDropTest/QZXingTestApp.pro
+++ b/examples/QZXingDragNDropTest/QZXingTestApp.pro
@@ -39,8 +39,10 @@ SOURCES += main.cpp \
 include(../../source/QZXing.pri)
 
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
-include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
+#include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
 qtcAddDeployment()
 
 HEADERS += \
     droparea.h
+
+OTHER_FILES +=
diff --git a/examples/QZXingDragNDropTest/qml/QZXingTestApp/ToggleButton.qml b/examples/QZXingDragNDropTest/qml/QZXingTestApp/ToggleButton.qml
index 45a3c47..081700a 100644
--- a/examples/QZXingDragNDropTest/qml/QZXingTestApp/ToggleButton.qml
+++ b/examples/QZXingDragNDropTest/qml/QZXingTestApp/ToggleButton.qml
@@ -1,5 +1,5 @@
 // import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
-import QtQuick 2.2
+import QtQuick 1.0
 
 Rectangle {
     id: rect
diff --git a/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.cpp
index b58190f..08efe71 100644
--- a/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.cpp
+++ b/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.cpp
@@ -8,6 +8,10 @@
   may offer an updated version of it.
 */
 
+#include <qglobal.h>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+
 #include "qtquick2applicationviewer.h"
 
 #include <QtCore/QCoreApplication>
@@ -85,3 +89,4 @@ void QtQuick2ApplicationViewer::showExpanded()
     show();
 #endif
 }
+#endif // version checking
diff --git a/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.h
index cf66f14..6cd1e32 100644
--- a/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.h
+++ b/examples/QZXingDragNDropTest/qtquick2applicationviewer/qtquick2applicationviewer.h
@@ -11,12 +11,20 @@
 #ifndef QTQUICK2APPLICATIONVIEWER_H
 #define QTQUICK2APPLICATIONVIEWER_H
 
-#include <QtQuick/QQuickView>
+#include <qglobal.h>
+#include <QObject>
 
-class QtQuick2ApplicationViewer : public QQuickView
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+#include <QtQuick/QQuickView>
+#endif
+
+class QtQuick2ApplicationViewer
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+                : public QQuickView
+#endif
 {
     Q_OBJECT
-
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
 public:
     explicit QtQuick2ApplicationViewer(QWindow *parent = 0);
     virtual ~QtQuick2ApplicationViewer();
@@ -28,6 +36,7 @@ public:
 
 private:
     class QtQuick2ApplicationViewerPrivate *d;
+#endif
 };
 
 #endif // QTQUICK2APPLICATIONVIEWER_H
diff --git a/source/QZXing.pri b/source/QZXing.pri
index 3e1ecb0..c87e024 100644
--- a/source/QZXing.pri
+++ b/source/QZXing.pri
@@ -257,7 +257,8 @@ unix:!symbian {
 win32-msvc*{
 
     INCLUDEPATH += $$PWD/zxing/win32/zxing
-    HEADERS += $$PWD/zxing/win32/zxing/stdint.h \
+	            $$PWD/zxing/win32/zxing/msvc
+    HEADERS += $$PWD/zxing/win32/zxing/msvc/stdint.h \
                 $$PWD/zxing/win32/zxing/iconv.h
 
     SOURCES += $$PWD/zxing/win32/zxing/win_iconv.c
diff --git a/source/QZXing.pro b/source/QZXing.pro
index 1c84fad..f2e24b5 100644
--- a/source/QZXing.pro
+++ b/source/QZXing.pro
@@ -262,9 +262,10 @@ unix:!symbian {
 
 win32-msvc*{
 
-    INCLUDEPATH += zxing/win32/zxing
-    HEADERS += zxing/win32/zxing/stdint.h \
-				zxing/win32/zxing/iconv.h
+    INCLUDEPATH += zxing/win32/zxing \
+            zxing/win32/zxing/msvc
+    HEADERS += zxing/win32/zxing/msvc/stdint.h \
+                zxing/win32/zxing/iconv.h
 	SOURCES += zxing/win32/zxing/win_iconv.c
 }
 
diff --git a/source/zxing/win32/zxing/stdint.h b/source/zxing/win32/zxing/msvc/stdint.h
similarity index 100%
rename from source/zxing/win32/zxing/stdint.h
rename to source/zxing/win32/zxing/msvc/stdint.h
diff --git a/source/zxing/zxing/DecodeHints.cpp b/source/zxing/zxing/DecodeHints.cpp
index a3ea73c..4415918 100644
--- a/source/zxing/zxing/DecodeHints.cpp
+++ b/source/zxing/zxing/DecodeHints.cpp
@@ -20,6 +20,7 @@
 
 #include <zxing/DecodeHints.h>
 #include <zxing/common/IllegalArgumentException.h>
+#include <qglobal.h>
 
 using zxing::Ref;
 using zxing::ResultPointCallback;
@@ -29,9 +30,12 @@ using zxing::DecodeHints;
 // VC++
 using zxing::BarcodeFormat;
 
-const DecodeHintType DecodeHints::CHARACTER_SET;
+//favoritas37-22-01-14-change
+#ifndef Q_CC_MSVC
+const zxing::DecodeHintType DecodeHints::CHARACTER_SET;
+#endif // Q_CC_MSVC
 
-const DecodeHints DecodeHints::PRODUCT_HINT(
+const zxing::DecodeHints DecodeHints::PRODUCT_HINT(
   UPC_A_HINT |
   UPC_E_HINT |
   EAN_13_HINT |
@@ -39,7 +43,7 @@ const DecodeHints DecodeHints::PRODUCT_HINT(
   RSS_14_HINT
   );
 
-const DecodeHints DecodeHints::ONED_HINT(
+const zxing::DecodeHints DecodeHints::ONED_HINT(
   CODE_39_HINT |
   CODE_93_HINT |
   CODE_128_HINT |
@@ -48,7 +52,7 @@ const DecodeHints DecodeHints::ONED_HINT(
   DecodeHints::PRODUCT_HINT
   );
 
-const DecodeHints DecodeHints::DEFAULT_HINT(
+const zxing::DecodeHints DecodeHints::DEFAULT_HINT(
   ONED_HINT |
   QR_CODE_HINT |
   DATA_MATRIX_HINT |
@@ -132,7 +136,7 @@ Ref<ResultPointCallback> DecodeHints::getResultPointCallback() const {
   return callback;
 }
 
-DecodeHints zxing::operator | (DecodeHints const& l, DecodeHints const& r) {
+zxing::DecodeHints zxing::operator | (DecodeHints const& l, DecodeHints const& r) {
   DecodeHints result (l);
   result.hints |= r.hints;
   if (!result.callback) {
diff --git a/source/zxing/zxing/ZXing.h b/source/zxing/zxing/ZXing.h
index 0b6918d..5e0f411 100644
--- a/source/zxing/zxing/ZXing.h
+++ b/source/zxing/zxing/ZXing.h
@@ -42,8 +42,8 @@ typedef bool boolean;
 #include <float.h>
 
 namespace zxing {
-inline bool isnan(float v) {return _isnan(v) != 0;}
-inline bool isnan(double v) {return _isnan(v) != 0;}
+inline bool isnan_z(float v) {return _isnan(v) != 0;}
+inline bool isnan_z(double v) {return _isnan(v) != 0;}
 inline float nan() {return std::numeric_limits<float>::quiet_NaN();}
 }
 
@@ -52,8 +52,8 @@ inline float nan() {return std::numeric_limits<float>::quiet_NaN();}
 #include <cmath>
 
 namespace zxing {
-inline bool isnan(float v) {return std::isnan(v);}
-inline bool isnan(double v) {return std::isnan(v);}
+inline bool isnan_z(float v) {return std::isnan(v);}
+inline bool isnan_z(double v) {return std::isnan(v);}
 inline float nan() {return std::numeric_limits<float>::quiet_NaN();}
 }
 
diff --git a/source/zxing/zxing/pdf417/detector/LinesSampler.cpp b/source/zxing/zxing/pdf417/detector/LinesSampler.cpp
index 62c0054..fc70db9 100644
--- a/source/zxing/zxing/pdf417/detector/LinesSampler.cpp
+++ b/source/zxing/zxing/pdf417/detector/LinesSampler.cpp
@@ -20,6 +20,8 @@
 #include <zxing/pdf417/decoder/BitMatrixParser.h>
 #include <zxing/NotFoundException.h>
 #include <zxing/common/Point.h>
+#include <cmath>
+#include <qglobal.h>
 
 using std::map;
 using std::vector;
@@ -35,10 +37,13 @@ using zxing::Point;
 // VC++
 using zxing::Line;
 
+//favoritas37-22-01-14-change
+#ifndef Q_CC_MSVC
 const int LinesSampler::MODULES_IN_SYMBOL;
 const int LinesSampler::BARS_IN_SYMBOL;
 const int LinesSampler::POSSIBLE_SYMBOLS;
 const int LinesSampler::BARCODE_START_OFFSET;
+#endif //Q_CC_MSVC
 
 namespace {
 
diff --git a/source/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp b/source/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp
index 8ce4321..5f46671 100644
--- a/source/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp
+++ b/source/zxing/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp
@@ -100,7 +100,7 @@ Ref<AlignmentPattern> AlignmentPatternFinder::handlePossibleCenter(vector<int> &
   int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2];
   float centerJ = centerFromEnd(stateCount, j);
   float centerI = crossCheckVertical(i, (int)centerJ, 2 * stateCount[1], stateCountTotal);
-  if (!isnan(centerI)) {
+  if (!isnan_z(centerI)) {
     float estimatedModuleSize = (float)(stateCount[0] + stateCount[1] + stateCount[2]) / 3.0f;
     int max = possibleCenters_->size();
     for (int index = 0; index < max; index++) {
diff --git a/source/zxing/zxing/qrcode/detector/QRDetector.cpp b/source/zxing/zxing/qrcode/detector/QRDetector.cpp
index d1e5506..b5ae1f9 100644
--- a/source/zxing/zxing/qrcode/detector/QRDetector.cpp
+++ b/source/zxing/zxing/qrcode/detector/QRDetector.cpp
@@ -195,10 +195,10 @@ float Detector::calculateModuleSizeOneWay(Ref<ResultPoint> pattern, Ref<ResultPo
                                                           (int)otherPattern->getX(), (int)otherPattern->getY());
   float moduleSizeEst2 = sizeOfBlackWhiteBlackRunBothWays((int)otherPattern->getX(), (int)otherPattern->getY(),
                                                           (int)pattern->getX(), (int)pattern->getY());
-  if (zxing::isnan(moduleSizeEst1)) {
+  if (zxing::isnan_z(moduleSizeEst1)) {
     return moduleSizeEst2;
   }
-  if (zxing::isnan(moduleSizeEst2)) {
+  if (zxing::isnan_z(moduleSizeEst2)) {
     return moduleSizeEst1;
   }
   // Average them, and divide by 7 since we've counted the width of 3 black modules,
diff --git a/source/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp b/source/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp
index 1f3228b..3a4f71d 100644
--- a/source/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp
+++ b/source/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp
@@ -238,10 +238,10 @@ bool FinderPatternFinder::handlePossibleCenter(int* stateCount, size_t i, size_t
   int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4];
   float centerJ = centerFromEnd(stateCount, j);
   float centerI = crossCheckVertical(i, (size_t)centerJ, stateCount[2], stateCountTotal);
-  if (!isnan(centerI)) {
+  if (!isnan_z(centerI)) {
     // Re-cross check
     centerJ = crossCheckHorizontal((size_t)centerJ, (size_t)centerI, stateCount[2], stateCountTotal);
-    if (!isnan(centerJ)) {
+    if (!isnan_z(centerJ)) {
       float estimatedModuleSize = (float)stateCountTotal / 7.0f;
       bool found = false;
       size_t max = possibleCenters_.size();