diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-22 13:47:08 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 13:17:33 +0100 |
| commit | 502d3d6744913899da87acfda5ebdab42c40329e (patch) | |
| tree | 16658a328503bfd5a62b4fd5d69ffb66e9854b18 /qmake/qmake.pro | |
| parent | d1be8b9ceb2c7b20bbe53a07154c79699540ea3d (diff) | |
| parent | 06bb315beb6c2c398223cfe52cbc7f66e14a8557 (diff) | |
Merge remote-tracking branch 'origin/dev' into merge-dev
Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
Diffstat (limited to 'qmake/qmake.pro')
| -rw-r--r-- | qmake/qmake.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 42c727b33e..745ee9b6af 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -31,7 +31,8 @@ INCLUDEPATH += \ generators \ generators/unix \ generators/win32 \ - generators/mac + generators/mac \ + ../src/3rdparty/tinycbor/src SOURCES += \ main.cpp \ @@ -116,6 +117,7 @@ SOURCES += \ qbytearray.cpp \ qbytearraymatcher.cpp \ qcalendar.cpp \ + qcborstreamwriter.cpp \ qcborvalue.cpp \ qcryptographichash.cpp \ qdatetime.cpp \ @@ -175,6 +177,7 @@ HEADERS += \ qcalendar.h \ qcalendarbackend_p.h \ qcalendarmath_p.h \ + qcborstreamwriter.h \ qcborvalue.h \ qcborvalue_p.h \ qchar.h \ |