From 43c28aa9046967abeb4ad042c8be1aa23a19c282 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 28 Jan 2021 16:06:26 +0100 Subject: Use Core library for qmake instead of the Bootstrap library Move the qmake-specific logic of the QLibraryInfo class to qmake internals. 'qconfig.cpp.in' now stores information about the library info entries to keep them consistent between qmake and the Core library. qmake requires specific features enabled in the Core library, so building qmake will be skipped if the features are not enabled. All flags directly related to the qmake have been removed from Core lib. Remove all bootstrap related sections from qmake CMakeLists.txt Task-number: QTBUG-89369 Change-Id: I26de157d3bfd4a5526699296e9d46e1c180b89ae Reviewed-by: Edward Welbourne Reviewed-by: Kai Koehne --- src/corelib/serialization/qjsoncbor.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib/serialization/qjsoncbor.cpp') diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 6256028c3a..53ee73d905 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -201,7 +201,6 @@ QJsonValue qt_convertToJson(QCborContainerPrivate *d, qsizetype idx, static QJsonValue convertExtendedTypeToJson(QCborContainerPrivate *d) { -#ifndef QT_BUILD_QMAKE qint64 tag = d->elements.at(0).value; switch (tag) { @@ -222,7 +221,6 @@ static QJsonValue convertExtendedTypeToJson(QCborContainerPrivate *d) return s; } } -#endif // for all other tags, ignore it and return the converted tagged item return qt_convertToJson(d, 1); -- cgit v1.2.3