mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 18:37:52 +08:00
3bffe1c049
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
|
|
index 3879b48..c380893 100644
|
|
--- a/src/corelib/tools/qarraydata.cpp
|
|
+++ b/src/corelib/tools/qarraydata.cpp
|
|
@@ -149,19 +149,16 @@
|
|
|
|
// End of qtools_p.h implementation
|
|
|
|
-QT_WARNING_PUSH
|
|
-QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
|
|
-
|
|
const QArrayData QArrayData::shared_null[2] = {
|
|
{ Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared null
|
|
- /* zero initialized terminator */};
|
|
+ { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */
|
|
+};
|
|
|
|
static const QArrayData qt_array[3] = {
|
|
{ Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared empty
|
|
{ { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, sizeof(QArrayData) }, // unsharable empty
|
|
- /* zero initialized terminator */};
|
|
-
|
|
-QT_WARNING_POP
|
|
+ { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */
|
|
+};
|
|
|
|
static const QArrayData &qt_array_empty = qt_array[0];
|
|
static const QArrayData &qt_array_unsharable_empty = qt_array[1];
|