From 335fdd66947adadcdaaeb2896c42fba28d67843a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20OCHS?= Date: Mon, 28 Mar 2011 13:28:00 +0200 Subject: Fix errors when compiling Qt with STLport Task-number: QTBUG-18374 Reviewed-by: Olivier Goffart Merge-request: 1157 --- src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h | 4 +++- tools/linguist/lupdate/qdeclarative.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) 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 + #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 1c1e9ad..6bf9cf4 100644 --- a/tools/linguist/lupdate/qdeclarative.cpp +++ b/tools/linguist/lupdate/qdeclarative.cpp @@ -62,6 +62,7 @@ #include #include +#include QT_BEGIN_NAMESPACE -- cgit v0.12