diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
| commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
| tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /qmake | |
| parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) | |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 21abc53457..3f30387fd4 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -30,6 +30,7 @@ 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/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.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 @@ -112,6 +113,7 @@ qt_add_executable(qmake (..)/include/QtCore//QtCore (..)/src/corelib/global . + ../src/3rdparty/tinycbor/src generators generators/mac generators/unix diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 056f17699b..ff50f507c5 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -37,6 +37,7 @@ 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/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.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 |