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 /src/tools/bootstrap | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index 811b7d2fb3..778006aff1 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -53,9 +53,10 @@ qt_add_module(Bootstrap ../../corelib/kernel/qsystemsemaphore.cpp ../../corelib/kernel/qvariant.cpp ../../corelib/plugin/quuid.cpp + ../../corelib/serialization/qcborvalue.cpp ../../corelib/serialization/qdatastream.cpp - ../../corelib/serialization/qjson.cpp ../../corelib/serialization/qjsonarray.cpp + ../../corelib/serialization/qjsoncbor.cpp ../../corelib/serialization/qjsondocument.cpp ../../corelib/serialization/qjsonobject.cpp ../../corelib/serialization/qjsonparser.cpp @@ -87,7 +88,6 @@ qt_add_module(Bootstrap ../../corelib/tools/qcryptographichash.cpp ../../corelib/tools/qhash.cpp ../../corelib/tools/qline.cpp - ../../corelib/tools/qlist.cpp ../../corelib/tools/qmap.cpp ../../corelib/tools/qpoint.cpp ../../corelib/tools/qrect.cpp diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index d4350da373..d6e6b979b3 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -51,9 +51,10 @@ qt_extend_target(Bootstrap ../../corelib/kernel/qsystemsemaphore.cpp ../../corelib/kernel/qvariant.cpp ../../corelib/plugin/quuid.cpp + ../../corelib/serialization/qcborvalue.cpp ../../corelib/serialization/qdatastream.cpp - ../../corelib/serialization/qjson.cpp ../../corelib/serialization/qjsonarray.cpp + ../../corelib/serialization/qjsoncbor.cpp ../../corelib/serialization/qjsondocument.cpp ../../corelib/serialization/qjsonobject.cpp ../../corelib/serialization/qjsonparser.cpp @@ -85,7 +86,6 @@ qt_extend_target(Bootstrap ../../corelib/tools/qcryptographichash.cpp ../../corelib/tools/qhash.cpp ../../corelib/tools/qline.cpp - ../../corelib/tools/qlist.cpp ../../corelib/tools/qmap.cpp ../../corelib/tools/qpoint.cpp ../../corelib/tools/qrect.cpp |