Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/qt5-qtdeclarative.git#543594243ad0006bf4d98998ecfa52b46242f0ed
This commit is contained in:
DistroBaker 2020-10-27 22:03:34 +01:00 committed by Petr Šabata
parent b887a02594
commit f9abd0f476
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 76daead8..4f707703 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -37,6 +37,7 @@
**
****************************************************************************/
+#include <limits>
#include "qv4regexp_p.h"
#include "qv4engine_p.h"
#include "qv4scopedvalue_p.h"
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index a7e37d19..21c3b465 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -40,6 +40,8 @@
#ifndef QQMLPROFILEREVENT_P_H
#define QQMLPROFILEREVENT_P_H
+#include <limits>
+
#include "qqmlprofilerclientdefinitions_p.h"
#include <QtCore/qstring.h>

View File

@ -8,7 +8,7 @@
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.15.1
Release: 1%{?dist}
Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -23,6 +23,7 @@ Source5: qv4global_p-multilib.h
## upstream patches
## upstreamable patches
Patch0: %{name}-gcc11.patch
# filter qml provides
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
@ -77,6 +78,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-everywhere-src-%{version}
%patch0 -p1
%build
@ -199,6 +201,9 @@ make check -k -C tests ||:
%changelog
* Fri Oct 16 2020 Jeff Law <law@redhat.com> - 5.15.1-2
- Fix missing #includes for gcc-11
* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
- 5.15.1