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 --- qmake/Makefile.win32 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qmake') diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index fd1ddc0b0d..b1936f3cec 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -219,3 +219,7 @@ qmake_pch.obj: {$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< + +# Make sure qstring_compat.obj isn't compiled with PCH enabled +qstring_compat.obj: $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp + $(CXX) -c $(CXXFLAGS_BARE) $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp -- cgit v1.2.3