206 lines
11 KiB
Diff
206 lines
11 KiB
Diff
diff -Naur old/qtscxml/tools/qscxmlc/qscxmlc.cpp new/qtscxml/tools/qscxmlc/qscxmlc.cpp
|
||
--- old/qtscxml/tools/qscxmlc/qscxmlc.cpp 2020-01-14 13:08:19.355403310 +0300
|
||
+++ new/qtscxml/tools/qscxmlc/qscxmlc.cpp 2020-01-14 20:06:21.491384608 +0300
|
||
@@ -76,10 +76,10 @@
|
||
|
||
QTextStream h(&outH);
|
||
h.setCodec(utf8);
|
||
- h.setGenerateByteOrderMark(true);
|
||
+ h.setGenerateByteOrderMark(false);
|
||
QTextStream c(&outCpp);
|
||
c.setCodec(utf8);
|
||
- c.setGenerateByteOrderMark(true);
|
||
+ c.setGenerateByteOrderMark(false);
|
||
CppDumper dumper(h, c);
|
||
dumper.dump(tu);
|
||
h.flush();
|
||
diff -Naur old/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp new/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
||
--- old/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp 2020-01-14 13:08:18.399383868 +0300
|
||
+++ new/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp 2020-01-14 20:05:33.746405399 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/****************************************************************************
|
||
+/****************************************************************************
|
||
**
|
||
** Copyright (C) 2017 The Qt Company Ltd.
|
||
** Contact: http://www.qt.io/licensing/
|
||
diff -Naur old/qtserialbus/src/plugins/canbus/systeccan/systeccanbackend.cpp new/qtserialbus/src/plugins/canbus/systeccan/systeccanbackend.cpp
|
||
--- old/qtserialbus/src/plugins/canbus/systeccan/systeccanbackend.cpp 2020-01-14 13:08:18.407384030 +0300
|
||
+++ new/qtserialbus/src/plugins/canbus/systeccan/systeccanbackend.cpp 2020-01-14 20:05:33.754405563 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/****************************************************************************
|
||
+/****************************************************************************
|
||
**
|
||
** Copyright (C) 2017 Andre Hartmann <aha_1980@gmx.de>
|
||
** Contact: http://www.qt.io/licensing/
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/AMFImporter_Geometry.cpp new/qt3d/src/3rdparty/assimp/code/AMFImporter_Geometry.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/AMFImporter_Geometry.cpp 2020-01-14 13:06:22.041017310 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/AMFImporter_Geometry.cpp 2020-01-14 20:09:09.870838294 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/AMFImporter_Macro.hpp new/qt3d/src/3rdparty/assimp/code/AMFImporter_Macro.hpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/AMFImporter_Macro.hpp 2020-01-14 13:06:21.937015193 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/AMFImporter_Macro.hpp 2020-01-14 20:09:09.194824426 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/AMFImporter_Material.cpp new/qt3d/src/3rdparty/assimp/code/AMFImporter_Material.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/AMFImporter_Material.cpp 2020-01-14 13:06:21.929015031 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/AMFImporter_Material.cpp 2020-01-14 20:09:09.098822457 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/AMFImporter_Node.hpp new/qt3d/src/3rdparty/assimp/code/AMFImporter_Node.hpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/AMFImporter_Node.hpp 2020-01-14 13:06:22.001016495 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/AMFImporter_Node.hpp 2020-01-14 20:09:09.466830006 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/AMFImporter_Postprocess.cpp new/qt3d/src/3rdparty/assimp/code/AMFImporter_Postprocess.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/AMFImporter_Postprocess.cpp 2020-01-14 13:06:21.921014868 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/AMFImporter_Postprocess.cpp 2020-01-14 20:09:09.054821555 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTF2Asset.h new/qt3d/src/3rdparty/assimp/code/glTF2Asset.h
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTF2Asset.h 2020-01-14 13:06:22.021016903 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTF2Asset.h 2020-01-14 20:09:09.662834027 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTF2AssetWriter.inl new/qt3d/src/3rdparty/assimp/code/glTF2AssetWriter.inl
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTF2AssetWriter.inl 2020-01-14 13:06:22.061017716 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTF2AssetWriter.inl 2020-01-14 20:09:10.070842397 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTF2Exporter.cpp new/qt3d/src/3rdparty/assimp/code/glTF2Exporter.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTF2Exporter.cpp 2020-01-14 13:06:21.973015926 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTF2Exporter.cpp 2020-01-14 20:09:09.306826724 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTFAsset.h new/qt3d/src/3rdparty/assimp/code/glTFAsset.h
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTFAsset.h 2020-01-14 13:06:21.989016251 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTFAsset.h 2020-01-14 20:09:09.346827545 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTFAsset.inl new/qt3d/src/3rdparty/assimp/code/glTFAsset.inl
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTFAsset.inl 2020-01-14 13:06:22.057017635 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTFAsset.inl 2020-01-14 20:09:09.994840838 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTFAssetWriter.inl new/qt3d/src/3rdparty/assimp/code/glTFAssetWriter.inl
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTFAssetWriter.inl 2020-01-14 13:06:21.993016333 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTFAssetWriter.inl 2020-01-14 20:09:09.354827709 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTFExporter.cpp new/qt3d/src/3rdparty/assimp/code/glTFExporter.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTFExporter.cpp 2020-01-14 13:06:22.053017554 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTFExporter.cpp 2020-01-14 20:09:09.930839524 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/glTFImporter.cpp new/qt3d/src/3rdparty/assimp/code/glTFImporter.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/glTFImporter.cpp 2020-01-14 13:06:22.053017554 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/glTFImporter.cpp 2020-01-14 20:09:09.910839114 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Open Asset Import Library (assimp)
|
||
----------------------------------------------------------------------
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/ImporterRegistry.cpp new/qt3d/src/3rdparty/assimp/code/ImporterRegistry.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/ImporterRegistry.cpp 2020-01-14 13:06:22.001016495 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/ImporterRegistry.cpp 2020-01-14 20:09:09.446829596 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/code/ValidateDataStructure.cpp new/qt3d/src/3rdparty/assimp/code/ValidateDataStructure.cpp
|
||
--- old/qt3d/src/3rdparty/assimp/code/ValidateDataStructure.cpp 2020-01-14 13:06:22.005016577 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/code/ValidateDataStructure.cpp 2020-01-14 20:09:09.590832550 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.h new/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.h
|
||
--- old/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.h 2020-01-14 13:06:22.093018367 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.h 2020-01-14 20:09:10.522851668 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc.
|
||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl new/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
|
||
--- old/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl 2020-01-14 13:06:22.093018367 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl 2020-01-14 20:09:10.466850519 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc.
|
||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/contrib/poly2tri/README new/qt3d/src/3rdparty/assimp/contrib/poly2tri/README
|
||
--- old/qt3d/src/3rdparty/assimp/contrib/poly2tri/README 2020-01-14 13:06:22.153019588 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/contrib/poly2tri/README 2020-01-14 20:09:10.426849699 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-==================
|
||
+==================
|
||
INSTALLATION GUIDE
|
||
==================
|
||
|
||
diff -Naur old/qt3d/src/3rdparty/assimp/include/assimp/scene.h new/qt3d/src/3rdparty/assimp/include/assimp/scene.h
|
||
--- old/qt3d/src/3rdparty/assimp/include/assimp/scene.h 2020-01-14 13:06:22.077018042 +0300
|
||
+++ new/qt3d/src/3rdparty/assimp/include/assimp/scene.h 2020-01-14 20:09:10.154844119 +0300
|
||
@@ -1,4 +1,4 @@
|
||
-/*
|
||
+/*
|
||
---------------------------------------------------------------------------
|
||
Open Asset Import Library (assimp)
|
||
---------------------------------------------------------------------------
|