diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-qxcbwindow.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-qxcbwindow.patch new file mode 100644 index 0000000000..90301faaf8 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-base/files/qtbase-qxcbwindow.patch @@ -0,0 +1,95 @@ +From 0c1831178540462da31fd7a4b6d2e446bc84498b Mon Sep 17 00:00:00 2001 +From: Erik Kurzinger +Date: Thu, 13 Jun 2019 08:15:50 -0700 +Subject: Track swap interval in QXcbWindow + +As per GLX_EXT_swap_control, the GLX swap interval is specified on a +per-drawable basis. However, QGLXContext only tracks it per-context +using the m_swapInterval member. If a new drawable is made current to a +context, it is still necessary to call glXSwapIntervalEXT to change the +swap interval, even if it has been previously called for the same +context with a different drawable. However, currently, +QGLXContext::makeCurrent doesn't do this if its m_swapInterval field +matches the new swap interval. This change removes m_swapInterval from +QGLXContext, instead tracking it in QXcbWindow. This still avoids +unnecessary calls to glXSwapIntervalEXT, while ensuring the swap +interval is always set for new window drawables. + +Change-Id: Idc34101476c6af618059f6f3d8925dee743994a3 +Reviewed-by: Giuseppe D'Angelo +Reviewed-by: Laszlo Agocs +--- + .../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 6 +++--- + src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h | 1 - + src/plugins/platforms/xcb/qxcbwindow.h | 4 ++++ + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +index 4adf662152..f26f698e76 100644 +--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -204,7 +204,6 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat + , m_shareContext(0) + , m_format(format) + , m_isPBufferCurrent(false) +- , m_swapInterval(-1) + , m_ownsContext(nativeHandle.isNull()) + , m_getGraphicsResetStatus(0) + , m_lost(false) +@@ -567,9 +566,9 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface) + + if (success && surfaceClass == QSurface::Window) { + int interval = surface->format().swapInterval(); ++ QXcbWindow *window = static_cast(surface); + QXcbScreen *screen = screenForPlatformSurface(surface); +- if (interval >= 0 && m_swapInterval != interval && screen) { +- m_swapInterval = interval; ++ if (interval >= 0 && interval != window->swapInterval() && screen) { + typedef void (*qt_glXSwapIntervalEXT)(Display *, GLXDrawable, int); + typedef void (*qt_glXSwapIntervalMESA)(unsigned int); + static qt_glXSwapIntervalEXT glXSwapIntervalEXT = 0; +@@ -588,6 +587,7 @@ bool QGLXContext::makeCurrent(QPlatformSurface *surface) + glXSwapIntervalEXT(m_display, glxDrawable, interval); + else if (glXSwapIntervalMESA) + glXSwapIntervalMESA(interval); ++ window->setSwapInterval(interval); + } + } + +diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h +index be9d3f5dcb..2a88fd6e59 100644 +--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h ++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h +@@ -87,7 +87,6 @@ private: + GLXContext m_shareContext; + QSurfaceFormat m_format; + bool m_isPBufferCurrent; +- int m_swapInterval; + bool m_ownsContext; + GLenum (APIENTRY * m_getGraphicsResetStatus)(); + bool m_lost; +diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h +index f98cd8a74d..8258cc2dfa 100644 +--- a/src/plugins/platforms/xcb/qxcbwindow.h ++++ b/src/plugins/platforms/xcb/qxcbwindow.h +@@ -184,6 +184,9 @@ public: + static void setWindowTitle(const QXcbConnection *conn, xcb_window_t window, const QString &title); + static QString windowTitle(const QXcbConnection *conn, xcb_window_t window); + ++ int swapInterval() const { return m_swapInterval; } ++ void setSwapInterval(int swapInterval) { m_swapInterval = swapInterval; } ++ + public Q_SLOTS: + void updateSyncRequestCounter(); + +@@ -276,6 +279,7 @@ protected: + SyncState m_syncState = NoSyncNeeded; + + QXcbSyncWindowRequest *m_pendingSyncRequest = nullptr; ++ int m_swapInterval = -1; + }; + + class QXcbForeignWindow : public QXcbWindow +-- +cgit v1.2.1 + diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-zlib-compression.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-zlib-compression.patch new file mode 100644 index 0000000000..a2ef4d2861 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-base/files/qtbase-zlib-compression.patch @@ -0,0 +1,39 @@ +From cbdc9a7786278c31fdb6eb465f32d0374349c1ef Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Thu, 20 Jun 2019 09:36:46 -0700 +Subject: RCC: Change the default compression to Zlib + +Codebases using QResource::isCompressed() and assuming it is Zlib break +if zstd is enabled. So change the default back to Zlib until Qt 6.0. + +[ChangeLog][Important Behavior Changes] RCC's default compression +algorithm was changed back to Zlib, as it was in all previous releases +until 5.13.0. The default will remain Zlib for all Qt 5.x releases but +will change in Qt 6.0. To activate Zstd compression for your resources, +either pass the --compress-algo=zstd option to the rcc tool or add the +XML attribute compression-algorithm="zstd" to the tags in the +.qrc file. + +Task-number: QTBUG-76521 +Change-Id: Ief874765cd7b43798de3fffd15a9f56fd9ad1ad4 +Reviewed-by: Simon Hausmann +--- + src/tools/rcc/rcc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp +index 862e574f2d..011a7db810 100644 +--- a/src/tools/rcc/rcc.cpp ++++ b/src/tools/rcc/rcc.cpp +@@ -58,7 +58,7 @@ enum { + CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70 + }; + +-#if QT_CONFIG(zstd) ++#if QT_CONFIG(zstd) && QT_VERSION >= QT_VERSION_CHECK(6,0,0) + # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zstd + #elif !defined(QT_NO_COMPRESS) + # define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zlib +-- +cgit v1.2.1 + diff --git a/desktop/toolkit/qt5/qt5-base/files/virtualbox-focus.patch b/desktop/toolkit/qt5/qt5-base/files/virtualbox-focus.patch new file mode 100644 index 0000000000..a216fa23ee --- /dev/null +++ b/desktop/toolkit/qt5/qt5-base/files/virtualbox-focus.patch @@ -0,0 +1,27 @@ +diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp +index 06d1000993b..f98b2dfe3af 100644 +--- a/src/plugins/platforms/xcb/qxcbconnection.cpp ++++ b/src/plugins/platforms/xcb/qxcbconnection.cpp +@@ -132,7 +132,9 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra + if (!m_startupId.isNull()) + qunsetenv("DESKTOP_STARTUP_ID"); + ++ const int focusInDelay = 100; + m_focusInTimer.setSingleShot(true); ++ m_focusInTimer.setInterval(focusInDelay); + m_focusInTimer.callOnTimeout([]() { + // No FocusIn events for us, proceed with FocusOut normally. + QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason); +diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp +index 9382488b741..610eca06a55 100644 +--- a/src/plugins/platforms/xcb/qxcbwindow.cpp ++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp +@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut() + connection()->setFocusWindow(nullptr); + relayFocusToModalWindow(); + // Do not set the active window to nullptr if there is a FocusIn coming. +- connection()->focusInTimer().start(400); ++ connection()->focusInTimer().start(); + } + + struct QtMotifWmHints { diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml index 43281bbca5..9226e7b7cf 100755 --- a/desktop/toolkit/qt5/qt5-base/pspec.xml +++ b/desktop/toolkit/qt5/qt5-base/pspec.xml @@ -11,7 +11,7 @@ Cross platform application and UI framework Cross platform application and UI development framework 'GPL3' 'LGPL3' 'FDL' 'custom' - http://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz + http://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtbase-everywhere-src-5.13.0.tar.xz @@ -78,8 +78,9 @@ mkspecs.patch - - + qtbase-qxcbwindow.patch + qtbase-zlib-compression.patch + virtualbox-focus.patch @@ -262,6 +263,13 @@ --> + + 2019-06-20 + 5.13.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-04-16 5.12.2