diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-21 14:48:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-22 22:42:37 +0100 |
| commit | dd9444523de4a7ec02194f89ec4f141ae8efcb71 (patch) | |
| tree | 43aee64b77d7133bb826dbb05a23c74a4fcc109f /qmake | |
| parent | 224436f208f2985d09c78deff65f0856f72f00db (diff) | |
| download | qtbase-dd9444523de4a7ec02194f89ec4f141ae8efcb71.tar.gz qtbase-dd9444523de4a7ec02194f89ec4f141ae8efcb71.tar.bz2 qtbase-dd9444523de4a7ec02194f89ec4f141ae8efcb71.zip | |
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 <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 2 |
2 files changed, 3 insertions, 1 deletions
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 |