diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /qmake | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index d914f1cd85..21abc53457 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -30,8 +30,10 @@ qt_add_executable(qmake ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h ../src/corelib/kernel/qvariant.cpp ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h - ../src/corelib/serialization/qjson.cpp ../src/corelib/serialization/qjson_p.h + ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h + ../src/corelib/serialization/qjson_p.h ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h + ../src/corelib/serialization/qjsoncbor.cpp ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 85a0d41171..c484efd5ba 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -37,8 +37,10 @@ qt_add_tool(qmake # special case ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h ../src/corelib/kernel/qvariant.cpp ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h - ../src/corelib/serialization/qjson.cpp ../src/corelib/serialization/qjson_p.h + ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h + ../src/corelib/serialization/qjson_p.h ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h + ../src/corelib/serialization/qjsoncbor.cpp ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h |