diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-12-12 18:32:19 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-26 20:59:50 +0000 |
| commit | a6b697ca13945a174cff9f3e9b1af1cf61c0bea5 (patch) | |
| tree | 78d5fad97ff8e89f079df29cc5a75b4e7197bfc7 /qmake/Makefile.win32 | |
| parent | 657894624521b580f59ff5f58b9c0e9be159dc1c (diff) | |
Create corelib/serialization and move existing file formats into it
This is in preparation to adding CBOR support. We don't need yet another
dir for CBOR and placing it in src/corelib/json is just wrong.
Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
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 |