From dd9444523de4a7ec02194f89ec4f141ae8efcb71 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Nov 2013 14:48:37 +0100 Subject: make qmake auto-rebuild after path reconfiguration while the dependencies in the manual projects are crappy anyway, it is still worth to cover the case of the user changing the install paths. Change-Id: I0a7ca5c8ba660c689d6d7af6b65d878390d6456f Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- qmake/Makefile.unix | 2 +- qmake/Makefile.win32 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 2f04a88a42..ce83960884 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -224,7 +224,7 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp -qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp +qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(BUILD_PATH)/src/corelib/global/qconfig.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 73f4dd5de3..af1da918c6 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -163,6 +163,8 @@ $(OBJS): qmake_pch.obj $(QTOBJS): qmake_pch.obj +qlibraryinfo.obj: $(BUILD_PATH)\src\corelib\global\qconfig.cpp + qmake_pch.obj: $(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP $(QMKSRC)\qmake_pch.h -- cgit v1.2.3