From 48c82e90af12da74c713665ddfd7f8d825ae5bdb Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Thu, 16 Jan 2020 10:42:05 +0100
Subject: Post Merge Fixes

Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/tools/bootstrap/.prev_CMakeLists.txt | 5 +++++
 src/tools/bootstrap/CMakeLists.txt       | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'src/tools/bootstrap')

diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 40d2e85cef..e43c5eb350 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -53,6 +53,8 @@ qt_add_module(Bootstrap
         ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
         ../../corelib/serialization/qcborvalue.cpp
         ../../corelib/serialization/qdatastream.cpp
         ../../corelib/serialization/qjsonarray.cpp
@@ -105,6 +107,9 @@ qt_add_module(Bootstrap
         QT_VERSION_MINOR=
         QT_VERSION_PATCH=
         QT_VERSION_STR=\"\"
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
 )
 
 #### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 7762ef4ae4..2121faae12 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -51,6 +51,8 @@ qt_extend_target(Bootstrap
         ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
         ../../corelib/serialization/qcborvalue.cpp
         ../../corelib/serialization/qdatastream.cpp
         ../../corelib/serialization/qjsonarray.cpp
@@ -104,6 +106,9 @@ qt_extend_target(Bootstrap
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
     PUBLIC_INCLUDE_DIRECTORIES  # special case
         $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:Xml,INCLUDE_DIRECTORIES>
-- 
cgit v1.2.3