path: root/tools
diff options
authorThiago Macieira <>2013-12-13 16:43:43 -0800
committerThe Qt Project <>2014-02-01 06:56:45 +0100
commit9c9f609313b6a0ddf8e226b291324c97b504d07f (patch)
tree918a66c77bd1caf879007d1ea139b82e4930b3b5 /tools
parent8930839acbfb5cbc231cc73cbbe2d1f83236fb58 (diff)
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 <>
Diffstat (limited to 'tools')
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw
index 11bfbe562a..db8db54888 100644
--- a/tools/configure/Makefile.mingw
+++ b/tools/configure/Makefile.mingw
@@ -118,6 +118,10 @@ configureapp.o: $(CONFSRC)/configureapp.h $(CONFSRC)/environment.h $(CONFSRC)/to
environment.o: $(CONFSRC)/environment.h
tools.o: $(CONFSRC)/tools.h
+# Make sure qstring_compat.obj isn't compiled with PCH enabled
+qstring_compat.o: $(CORESRC)/tools/qstring_compat.cpp
+ $(CXX) -c $(CXXFLAGS_BARE) -o $@ $<
-rm -f *.o
-rm -rf *.gch
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32
index 2ec99d30b0..98a2181e39 100644
--- a/tools/configure/Makefile.win32
+++ b/tools/configure/Makefile.win32
@@ -163,3 +163,7 @@ quuid.obj: $(CORESRC)\plugin\quuid.cpp $(PCH)
$(CXX) -c $(CXXFLAGS) $<
$(CXX) -c $(CXXFLAGS) $<
+# Make sure qstring_compat.obj isn't compiled with PCH enabled
+qstring_compat.obj: $(CORESRC)\tools\qstring_compat.cpp
+ $(CXX) -c $(CXXFLAGS_BARE) $(CORESRC)\tools\qstring_compat.cpp