diff options
| author | Cédric OCHS <kervala@gmail.com> | 2011-03-28 11:28:00 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:24:56 (GMT) |
| commit | af43ab1bd73b908f2f82d65fe8fa8c62f5c78084 (patch) | |
| tree | 5e23dc54ae3e1e30958c7011a566c0876ab7af6b | |
| parent | 99ba5f8517b99d60d96f73f5743683d9898877ae (diff) | |
| download | Qt-af43ab1bd73b908f2f82d65fe8fa8c62f5c78084.zip Qt-af43ab1bd73b908f2f82d65fe8fa8c62f5c78084.tar.gz Qt-af43ab1bd73b908f2f82d65fe8fa8c62f5c78084.tar.bz2 | |
Fix errors when compiling Qt with STLport
Task-number: QTBUG-18374
Reviewed-by: Olivier Goffart
Merge-request: 1157
| -rw-r--r-- | src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h | 4 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qdeclarative.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h b/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h index 82ff9aa..0021ea3 100644 --- a/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h +++ b/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h @@ -22,7 +22,9 @@ # pragma warning(disable: 4512) // This would be very annoying # pragma warning(disable: 4290) // Ignore exception specification warning # pragma warning(disable: 4250) // Ignore 'class1' : inherits 'class2::member' via dominance (e.g. in MultiReader) - #if (_MSC_VER < 1310) + // Check for STLport presence + #include <string> + #if (_MSC_VER < 1310) || defined(_STLPORT_VERSION) #define CL_NS_HASHING(func) std::func //the namespace is different on VC 7.0 #else #define CL_NS_HASHING(func) stdext::func diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp index a5ac0a5..c539821 100644 --- a/tools/linguist/lupdate/qdeclarative.cpp +++ b/tools/linguist/lupdate/qdeclarative.cpp @@ -62,6 +62,7 @@ #include <iostream> #include <cstdlib> +#include <cctype> QT_BEGIN_NAMESPACE |