From e0ecdebaa18b81dfe6690e688b7aa44b8b559c0c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 26 Jan 2017 15:02:04 -0800 Subject: [PATCH] Unbreak the build with ICC on Windows Commit 52d64fca662d0e488801fc40dffdc0a732cfdbd5 made qlibraryinfo.obj be compiled with an extra -D argument, but that doesn't take effect since a precompiled header is in effect. Warning #673: the initial sequence of preprocessing directives is not compatible with those of precompiled header file "qmake_pch.pchi" qlibraryinfo.cpp(61): catastrophic error: cannot open source file "qconfig.cpp" Change-Id: Iab7c358838e1487387a2fffd149d74a9aa2be338 Reviewed-by: Oswald Buddenhagen --- qmake/Makefile.win32 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index c2e32dfc20..bb1f8aaabc 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -203,12 +203,12 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\corelib\json}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< -# Make sure qstring_compat.obj isn't compiled with PCH enabled +# Make sure qstring_compat.obj and qlibraryinfo.obj aren'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 qlibraryinfo.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp - $(CXX) $(CXXFLAGS) -DQT_BUILD_QMAKE_BOOTSTRAP $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp + $(CXX) $(CXXFLAGS_BARE) -DQT_BUILD_QMAKE_BOOTSTRAP $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp qlibraryinfo_final.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp $(BUILD_PATH)\src\corelib\global\qconfig.cpp $(CXX) $(CXXFLAGS) -Foqlibraryinfo_final.obj $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp