5.10.0

.gitignore

@@ -1,2 +1,3 @@
 /qtbase-opensource-src-5.9.2.tar.xz
 /qtbase-opensource-src-5.9.3.tar.xz
+/qtbase-everywhere-src-5.10.0.tar.xz

qt5-qtbase.spec

@@ -54,13 +54,13 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.9.3
-Release: 3%{?dist}
+Version: 5.10.0
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://qt-project.org/
-Source0: https://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
 Source1: qtlogging.ini
@@ -100,9 +100,6 @@ Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
 # drop -O3 and make -O2 by default
 Patch61: qt5-qtbase-cxxflag.patch
 
-# backport from upstream
-Patch63: qt5-qtbase-5.9.1-openssl11.patch
-
 # support firebird version 3.x
 Patch64: qt5-qtbase-5.9.1-firebird.patch
 
@@ -345,7 +342,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{version}
+%setup -q -n %{qt_module}-everywhere-src-%{version}
 
 ## upstream fixes
 %patch4 -p1 -b .QTBUG-35459
@@ -354,9 +351,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %patch51 -p1 -b .hidpi_scale_at_192
 %patch52 -p1 -b .moc_macros
 %patch61 -p1 -b .qt5-qtbase-cxxflag
-%if 0%{?openssl11}
-%patch63 -p1 -b .openssl11
-%endif
 %patch64 -p1 -b .firebird
 %if 0%{?fedora} > 27
 %patch65 -p1 -b .mysql
@@ -743,6 +737,7 @@ fi
 %{_bindir}/uic*
 %{_bindir}/qlalr
 %{_bindir}/fixqt4headers.pl
+%{_bindir}/qvkgen
 %{_qt5_bindir}/moc*
 %{_qt5_bindir}/qdbuscpp2xml*
 %{_qt5_bindir}/qdbusxml2cpp*
@@ -752,6 +747,7 @@ fi
 %{_qt5_bindir}/uic*
 %{_qt5_bindir}/qlalr
 %{_qt5_bindir}/fixqt4headers.pl
+%{_qt5_bindir}/qvkgen
 %if "%{_qt5_headerdir}" != "%{_includedir}"
 %dir %{_qt5_headerdir}
 %endif
@@ -770,6 +766,7 @@ fi
 %{_qt5_headerdir}/QtXml/
 %{_qt5_headerdir}/QtEglFSDeviceIntegration
 %{_qt5_headerdir}/QtInputSupport
+%{_qt5_headerdir}/QtEdidSupport
 %{_qt5_archdatadir}/mkspecs/
 %{_qt5_libdir}/libQt5Concurrent.prl
 %{_qt5_libdir}/libQt5Concurrent.so
@@ -878,6 +875,8 @@ fi
 %{_qt5_libdir}/libQt5KmsSupport.*a
 %{_qt5_libdir}/libQt5KmsSupport.prl
 %{_qt5_headerdir}/QtKmsSupport
+%{_qt5_libdir}/libQt5EdidSupport.*a
+%{_qt5_libdir}/libQt5EdidSupport.prl
 
 %if 0%{?examples}
 %files examples
@@ -981,6 +980,9 @@ fi
 
 
 %changelog
+* Fri Dec 15 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
+- 5.10.0
+
 * Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 5.9.3-3
 - Rebuild for ICU 60.1
 

qtbase-hidpi_scale_at_192.patch

@@ -1,13 +1,13 @@
 diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
-index 5e136b5..0ad2842 100644
+index ec0f9ba..6d0d7a6 100644
 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp
 +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
-@@ -620,7 +620,7 @@ void QXcbScreen::updateGeometry(const QRect &geom, uint8_t rotation)
-         m_sizeMillimeters = sizeInMillimeters(xGeometry.size(), virtualDpi());
+@@ -747,7 +747,7 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation)
+         m_sizeMillimeters = sizeInMillimeters(geometry.size(), virtualDpi());
 
-     qreal dpi = xGeometry.width() / physicalSize().width() * qreal(25.4);
+     qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4);
 -    m_pixelDensity = qMax(1, qRound(dpi/96));
 +    m_pixelDensity = qMax(1, (int) (dpi/96)); // instead of rounding at 1.5, round at 2.0 (same as GNOME)
-     m_geometry = QRect(xGeometry.topLeft(), xGeometry.size());
-     m_availableGeometry = xGeometry & m_virtualDesktop->workArea();
+     m_geometry = geometry;
+     m_availableGeometry = geometry & m_virtualDesktop->workArea();
      QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);

sources

@@ -1 +1 @@
-SHA512 (qtbase-opensource-src-5.9.3.tar.xz) = 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
+SHA512 (qtbase-everywhere-src-5.10.0.tar.xz) = 8f832fb7bc5087df4b897cd23145e5350f03ca06e2fc5ccb11a7b998e4885c1b936c3e4b989c15fc076134a6a081a35efa37f402b5e8b85e2c780006641b2cdc

xcberror_filter.patch

@@ -1,58 +1,41 @@
---- qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb/qxcbconnection.cpp	2016-12-01 02:17:04.000000000 -0600
-+++ qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb.new/qxcbconnection.cpp	2017-09-20 15:41:47.057359162 -0500
-@@ -109,6 +109,9 @@
- Q_LOGGING_CATEGORY(lcQpaXInputDevices, "qt.qpa.input.devices")
- Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events")
+From 911762e077c8b2f9795171c1e628942a0a979801 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Fri, 15 Dec 2017 11:56:12 +0100
+Subject: foo
+
+
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
+index 536c709..c6eb1b1 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -111,6 +111,8 @@ Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events")
  Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen")
-+Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb")
+ Q_LOGGING_CATEGORY(lcQpaEvents, "qt.qpa.events")
+ Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb") // for general (uncategorized) XCB logging
 +Q_LOGGING_CATEGORY(lcQpaXcbError, "qt.qpa.xcb.xcberror")
 +// TODO: How to categorize by xcberror type? (e.g. only BadWindow)
- 
+ Q_LOGGING_CATEGORY(lcQpaPeeker, "qt.qpa.peeker")
+
  // this event type was added in libxcb 1.10,
- // but we support also older version
-@@ -996,7 +999,9 @@
+@@ -964,7 +966,8 @@ void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
      uint clamped_error_code = qMin<uint>(error->error_code, (sizeof(xcb_errors) / sizeof(xcb_errors[0])) - 1);
      uint clamped_major_code = qMin<uint>(error->major_code, (sizeof(xcb_protocol_request_codes) / sizeof(xcb_protocol_request_codes[0])) - 1);
- 
+
 -    qWarning("QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
-+    //TODO: Make the category filterable based on the XCB Error
 +    qCWarning(lcQpaXcbError,
 +           "QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
             int(error->error_code), xcb_errors[clamped_error_code],
             int(error->sequence), int(error->resource_id),
             int(error->major_code), xcb_protocol_request_codes[clamped_major_code],
-@@ -1006,19 +1011,19 @@
-     int i = 0;
-     for (; i < m_callLog.size(); ++i) {
-         if (m_callLog.at(i).sequence == error->sequence) {
--            qDebug("Caused by: %s:%d", m_callLog.at(i).file.constData(), m_callLog.at(i).line);
-+            qCDebug(lcQpaXcbError, "Caused by: %s:%d", m_callLog.at(i).file.constData(), m_callLog.at(i).line);
-             break;
-         } else if (m_callLog.at(i).sequence > error->sequence) {
--            qDebug("Caused some time before: %s:%d", m_callLog.at(i).file.constData(),
-+            qCDebug(lcQpaXcbError, "Caused some time before: %s:%d", m_callLog.at(i).file.constData(),
-                    m_callLog.at(i).line);
-             if (i > 0)
--                qDebug("and after: %s:%d", m_callLog.at(i-1).file.constData(),
-+                qCDebug(lcQpaXcbError, "and after: %s:%d", m_callLog.at(i-1).file.constData(),
-                        m_callLog.at(i-1).line);
-             break;
-         }
-     }
-     if (i == m_callLog.size() && !m_callLog.isEmpty())
--        qDebug("Caused some time after: %s:%d", qAsConst(m_callLog).first().file.constData(),
-+        qCDebug(lcQpaXcbError, "Caused some time after: %s:%d", qAsConst(m_callLog).first().file.constData(),
-                qAsConst(m_callLog).first().line);
- #endif
- }
---- qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb/qxcbconnection.h	2016-12-01 02:17:04.000000000 -0600
-+++ qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb.new/qxcbconnection.h	2017-09-20 15:35:55.655555316 -0500
-@@ -87,6 +87,8 @@
- Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputDevices)
- Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents)
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
+index 999dc06..554611c 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.h
++++ b/src/plugins/platforms/xcb/qxcbconnection.h
+@@ -91,6 +91,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents)
  Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen)
-+Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaEvents)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb)
 +Q_DECLARE_LOGGING_CATEGORY(lcQpaXcbError)
- 
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaPeeker)
+
  class QXcbVirtualDesktop;
- class QXcbScreen;