diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-10 20:39:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-10 20:39:02 +0000 |
| commit | 095dbc494c6cb9815b0d9b521a3105b06f4bef33 (patch) | |
| tree | ec5b2ac5777406a533e820f21b5705b209855a0d /qmake/Makefile.win32 | |
| parent | 0b48fcee709ac0070d7b9213632edeafeeddc9e1 (diff) | |
| parent | 32b506d1db1f8cee748a27b548ba8208f2928058 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into 5.11" into refs/staging/5.11
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 28bf96939b..3abcc1f21c 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -197,13 +197,10 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< -{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj:: - $(CXX) $(CXXFLAGS) $< - -{$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj:: +{$(SOURCE_PATH)\src\corelib\serialization}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< -{$(SOURCE_PATH)\src\corelib\json}.cpp{}.obj:: +{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< # Make sure qstring_compat.obj and qlibraryinfo.obj aren't compiled with PCH enabled |