From 9c9f609313b6a0ddf8e226b291324c97b504d07f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 13 Dec 2013 16:43:43 -0800 Subject: Fix configure & qmake compilation with a future MSVC version When MSVC supports ref-qualified members, we need to ensure that qstring_compat.cpp can see the non-qualified definitions in qstring.h, which means no precompiled header. Alternatively, for a bootstrapped build we could not compile qstring_compat.cpp or #ifndef the functions. Change-Id: I8ece34503060f0b4b0f8f2df2fb9b0fb1311e269 Reviewed-by: Oswald Buddenhagen --- src/corelib/tools/qstring_compat.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/tools/qstring_compat.cpp index 34c37a9cb8..6613dfde8e 100644 --- a/src/corelib/tools/qstring_compat.cpp +++ b/src/corelib/tools/qstring_compat.cpp @@ -39,9 +39,8 @@ ** ****************************************************************************/ -#if defined(QSTRING_H) && !defined(QT_BOOTSTRAPPED) +#if defined(QSTRING_H) # error "This file cannot be compiled with pre-compiled headers" -// (unless it's configure.exe, which is bootstrapped) #endif #define QT_COMPILING_QSTRING_COMPAT_CPP -- cgit v1.2.3