diff options
| author | Debao Zhang <hello@debao.me> | 2015-03-30 13:22:13 +0800 |
|---|---|---|
| committer | Debao Zhang <hello@debao.me> | 2015-03-30 09:06:27 +0000 |
| commit | 32e437b1244e7bf45011e4fd770fc0eef40d02de (patch) | |
| tree | a301ecef480afff459efb04ad70689633be0dc6d | |
| parent | 5b8737723a39f7529422bb3832d5b6ac62762bec (diff) | |
Fix MSVC warning C4005: 'JAS_WIN_MSVC_BUILD' : macro redefinition
This macro has been defined in the jasper.pri file:
msvc: DEFINES += JAS_WIN_MSVC_BUILD
Change-Id: I3ac06e4f373c59ded4e3c2ebfa6f50e40a3c83ae
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| -rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp index 3c1958e..f69538c 100644 --- a/src/plugins/imageformats/jp2/qjp2handler.cpp +++ b/src/plugins/imageformats/jp2/qjp2handler.cpp @@ -38,9 +38,6 @@ #include "qvariant.h" #include "qcolor.h" -#ifdef Q_CC_MSVC -#define JAS_WIN_MSVC_BUILD -#endif #include <jasper/jasper.h> QT_BEGIN_NAMESPACE |