Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2019-06-28 16:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Fri Jun 28 16:32:03 2019 rev:97 rq:712125 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2019-06-12 13:05:31.841202951 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4615/libqt5-qtbase.changes 2019-06-28 16:32:04.954436952 +0200 @@ -1,0 +2,65 @@ +Wed Jun 26 12:20:32 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to restore compatibility with akonadi's PGSQL backend + (see https://bugs.archlinux.org/task/62997): + * 0001-Revert-Always-escape-the-table-names-when-creating-t.patch + +------------------------------------------------------------------- +Wed Jun 19 18:40:41 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Disable libzstd support again, it breaks various existing codebases (QTBUG-76521) + +------------------------------------------------------------------- +Wed Jun 19 11:19:21 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0: + * New bugfix release + * No changelog available + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.0/?h=5.13 +- Remove patches, now upstream: + * 0001-Add-quoting-to-deal-with-empty-CMAKE_CXX_STANDARD_LI.patch + +------------------------------------------------------------------- +Fri Jun 14 11:33:41 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patches to improve compatibility with Krita: + * 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch + * 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch + * 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch + +------------------------------------------------------------------- +Fri Jun 7 11:32:21 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Revert yet another commit to fix linker errors: + * 0001-Revert-qmake-link-qt-libraries-by-full-path.patch + +------------------------------------------------------------------- +Thu Jun 6 18:19:42 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Enable libzstd support + +------------------------------------------------------------------- +Thu Jun 6 18:09:01 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Revert some commits in the hope of fixing some broken paths (QTBUG-76255): + * 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch + * 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch + * 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch + +------------------------------------------------------------------- +Thu Jun 6 13:26:09 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix some cmake module config files (QTBUG-76244): + * 0001-Add-quoting-to-deal-with-empty-CMAKE_CXX_STANDARD_LI.patch + +------------------------------------------------------------------- +Tue Jun 4 07:24:16 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-rc: + * New bugfix release + * No changelog available +- Remove patches, now upstream: + * 0001-Fix-page-breaking-with-large-images.patch + +------------------------------------------------------------------- @@ -7,0 +73,11 @@ +Mon Apr 29 09:16:09 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-beta2: + * New bugfix release + * No changelog available +- Refresh Mesa multithreading whitelist revert: + * Add 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch + * Refresh 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch + * Refresh 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch + +------------------------------------------------------------------- @@ -26,0 +103,15 @@ +Thu Mar 21 10:24:28 UTC 2019 - fab...@ritter-vogt.de + +- Update to 5.13.0-beta1: + * New feature release + * For more details about Qt 5.13 please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.0/?h=5.13 +- Remove patches, now upstream: + * qapplication-emit-palettechanged.patch + * reproducible-qrc-time.patch +- Refresh Mesa multithreading whitelist revert: + * Drop 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch + * Refresh 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch +- libQt5XcbQpa is not static, move it to libQt5Gui-private-headers-devel + +------------------------------------------------------------------- @@ -2140,0 +2232 @@ + Old: ---- 0001-Fix-page-breaking-with-large-images.patch qapplication-emit-palettechanged.patch qtbase-everywhere-src-5.12.3.tar.xz reproducible-qrc-time.patch New: ---- 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch 0001-Revert-Always-escape-the-table-names-when-creating-t.patch 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch 0001-Revert-qmake-link-qt-libraries-by-full-path.patch 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch qtbase-everywhere-src-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.3lZMjl/_old 2019-06-28 16:32:11.830447343 +0200 +++ /var/tmp/diff_new_pack.3lZMjl/_new 2019-06-28 16:32:11.830447343 +0200 @@ -36,17 +36,17 @@ %endif Name: libqt5-qtbase -Version: 5.12.3 +Version: 5.13.0 Release: 0 Summary: C++ Program Library, Core Components License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: System/Libraries Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.12.3 -%define so_version 5.12.3 -%define tar_version qtbase-everywhere-src-5.12.3 -Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.13.0 +%define so_version 5.13.0 +%define tar_version qtbase-everywhere-src-5.13.0 +Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: Source1: libqt5-qtbase.changes Source2: macros.qt5 @@ -68,19 +68,25 @@ Patch17: 0001-Sanitize-QXcbScreen-s-pixelDensity-values.patch Patch18: 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch # PATCH-FIX-UPSTREAM -Patch19: qapplication-emit-palettechanged.patch -# PATCH-FIX-UPSTREAM Patch20: 0001-Fix-qfloat16-methods-definition-without-declaration-.patch # PATCH-FIX-OPENSUSE Patch21: 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch Patch22: 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch Patch23: 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch Patch24: fix-fixqt4headers.patch -# patches 1000-2000 and above from upstream 5.12 branch # -Patch1000: 0001-Fix-page-breaking-with-large-images.patch -# patches 2000-3000 and above from upstream 5.13/dev branch # -Patch2000: reproducible-qrc-time.patch - +# Revert to restore compatibility with akonadi and possibly other applications +Patch30: 0001-Revert-Always-escape-the-table-names-when-creating-t.patch +# Reverting some commits in the hope to avoid QTBUG-76255 +Patch50: 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch +Patch51: 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch +Patch52: 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch +Patch53: 0001-Revert-qmake-link-qt-libraries-by-full-path.patch +# patches 1000-2000 and above from upstream 5.13 branch # +Patch1000: 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch +# patches 2000-3000 and above from upstream 5.14/dev branch # +Patch2000: 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch +# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384 +Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -152,6 +158,8 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 BuildRequires: pkgconfig(zlib) +# Breaks various existing codebases, see QTBUG-76521 +# BuildRequires: pkgconfig(libzstd) %if %journald BuildRequires: pkgconfig(libsystemd) %endif @@ -888,6 +896,7 @@ -system-freetype \ -cups \ -system-zlib \ + -no-zstd \ -no-pch \ -glib \ -sctp \ @@ -1232,12 +1241,16 @@ %{libqt5_libdir}/libQt5EglFSDeviceIntegration.prl %{libqt5_libdir}/libQt5EglFsKmsSupport.prl %{libqt5_libdir}/libQt5EglFsKmsSupport.so +%{libqt5_libdir}/libQt5XcbQpa.so +%{libqt5_libdir}/libQt5XcbQpa.prl %{libqt5_libdir}/cmake/Qt5Gui/ %{libqt5_libdir}/pkgconfig/Qt5Gui.pc %{libqt5_includedir}/QtGui/ %{libqt5_includedir}/QtEglFSDeviceIntegration/ +%{libqt5_includedir}/QtXkbCommonSupport %exclude %{libqt5_includedir}/QtGui/%{so_version} %exclude %{libqt5_includedir}/QtEglFSDeviceIntegration/%{so_version} +%exclude %{libqt5_includedir}/QtXkbCommonSupport/%{so_version} %files devel %license LICENSE.* @@ -1302,8 +1315,8 @@ %files -n libQt5PlatformSupport-devel-static %license LICENSE.* %doc *.txt -%{libqt5_libdir}/libQt5XcbQpa.so -%{libqt5_libdir}/libQt5XcbQpa.prl +%{libqt5_libdir}/libQt5XkbCommonSupport.a +%{libqt5_libdir}/libQt5XkbCommonSupport.prl %{libqt5_libdir}/libQt5AccessibilitySupport.a %{libqt5_libdir}/libQt5AccessibilitySupport.prl %{libqt5_libdir}/libQt5DeviceDiscoverySupport.a @@ -1396,6 +1409,7 @@ %doc *.txt %{libqt5_includedir}/QtGui/%{so_version}/ %{libqt5_includedir}/QtEglFSDeviceIntegration/%{so_version} +%{libqt5_includedir}/QtXkbCommonSupport/%{so_version} %files -n libQt5KmsSupport-private-headers-devel %license LICENSE.* ++++++ 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch ++++++ >From a69373ff735e1ae3e14b5a05a08e4aebf9216185 Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov <dimul...@gmail.com> Date: Thu, 6 Dec 2018 16:16:27 +0300 Subject: [PATCH 1/3] Fix notification of QDockWidget when it gets undocked Before the patch the notification was emitted only when the docker was attached to the panel or changed a position on it. It looks like the old behavior was documented in a unittest, so this patch might actually be a "behavior change". Change-Id: Id3ffbd2018a8e68844d174328dd1c4ceb7fa01d3 Reviewed-by: Richard Moe Gustavsen <richard.gustav...@qt.io> --- src/widgets/widgets/qdockwidget.cpp | 2 ++ tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 4041c730b8..f98e0e44db 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1182,6 +1182,8 @@ void QDockWidgetPrivate::setWindowState(bool floating, bool unplug, const QRect QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q); if (mwlayout) emit q->dockLocationChanged(mwlayout->dockWidgetArea(q)); + } else { + emit q->dockLocationChanged(Qt::NoDockWidgetArea); } } diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index f8ce6a2c0a..625116654d 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -670,7 +670,11 @@ void tst_QDockWidget::dockLocationChanged() spy.clear(); dw.setFloating(true); - QTest::qWait(100); + QTRY_COMPARE(spy.count(), 1); + QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)), + Qt::NoDockWidgetArea); + spy.clear(); + dw.setFloating(false); QTRY_COMPARE(spy.count(), 1); QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)), -- 2.21.0 ++++++ 0001-Revert-Always-escape-the-table-names-when-creating-t.patch ++++++ ++++ 652 lines (skipped) ++++++ 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch ++++++ >From a473f90a3637255d8443ab8621b57a3e9d90b031 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Thu, 6 Jun 2019 20:05:27 +0200 Subject: [PATCH 1/3] Revert "Fix QMAKE_PRL_INSTALL_REPLACE for macOS" This reverts commit 015d7f16cb0b6812950caa3bcde3b6758403ae34. --- mkspecs/features/qt_common.prf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index e64dfa98c2..17a07dbab9 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -49,14 +49,10 @@ contains(TEMPLATE, .*lib) { lib_replace.match = $$rplbase/lib lib_replace.replace = $$qqt_libdir } + !equals(qt_libdir, $$rplbase/lib): \ + lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\) lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace - !equals(qt_libdir, $$rplbase/lib) { - qtlibdir_replace.match = $$qt_libdir - qtlibdir_replace.replace = $$qqt_libdir - qtlibdir_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace - } } # The remainder of this file must not apply to host tools/libraries, -- 2.21.0 ++++++ 0001-Revert-qmake-link-qt-libraries-by-full-path.patch ++++++ >From c28456522b71dfb207bfe47f91d6b0eeaec109bf Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Fri, 7 Jun 2019 13:31:40 +0200 Subject: [PATCH] Revert "qmake: link qt libraries by full path" This reverts commit 5b3dfa470ed7ea40103daa785286ab71fb7aa230. --- mkspecs/features/qt.prf | 31 +++++++++++++++++------------- mkspecs/features/win32/opengl.prf | 16 ++++----------- mkspecs/features/win32/windows.prf | 7 ++++--- mkspecs/linux-lsb-g++/qmake.conf | 1 + 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 3a71376029..5ac640190a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -145,14 +145,12 @@ import_plugins:qtConfig(static) { # the plugin path. Unknown plugins must rely on the default link path. plug_type = $$eval(QT_PLUGIN.$${plug}.TYPE) !isEmpty(plug_type) { - plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ plug_path = $$[QT_INSTALL_PLUGINS/get] - LIBS += $$plug_path/$$plug_type/$$plug_name - } else { - LIBS += -l$${plug}$$qtPlatformTargetSuffix() + LIBS += -L$$plug_path/$$plug_type } + LIBS += -l$${plug}$$qtPlatformTargetSuffix() } } @@ -197,6 +195,8 @@ for(ever) { qtProcessModuleFlags(DEFINES, QT.$${QTLIB}.DEFINES) MODULE_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS + MODULE_LIBS_ADD = $$MODULE_LIBS + MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS # Frameworks shouldn't need include paths, but much code does not use # module-qualified #includes, so by default we add paths which point @@ -209,17 +209,23 @@ for(ever) { !isEmpty(MODULE_MODULE) { contains(MODULE_CONFIG, lib_bundle) { framework = $$MODULE_MODULE - # Linking frameworks by absolute path does not work. LIBS$$var_sfx += -framework $$framework } else { + !isEmpty(MODULE_LIBS_ADD): \ + LIBS$$var_sfx += -L$$MODULE_LIBS_ADD + lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() - win32|contains(MODULE_CONFIG, staticlib) { - lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB - PRE_TARGETDEPS += $$lib - } else { - lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB + LIBS$$var_sfx += -l$$lib + + contains(MODULE_CONFIG, staticlib): \ + PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} + + !isEmpty(QMAKE_LSB) { + !isEmpty(MODULE_LIBS_ADD): \ + QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS_ADD + QMAKE_LFLAGS *= --lsb-shared-libs=$$lib + QMAKE_LIBDIR *= /opt/lsb/lib } - LIBS$$var_sfx += $$lib } } QMAKE_USE$$var_sfx += $$MODULE_USES @@ -289,8 +295,7 @@ contains(all_qt_module_deps, qml): \ for (key, IMPORTS._KEYS_) { PATH = $$eval(IMPORTS.$${key}.path) PLUGIN = $$eval(IMPORTS.$${key}.plugin) - !isEmpty(PATH):!isEmpty(PLUGIN): \ - LIBS += $$PATH/$$QMAKE_PREFIX_STATICLIB$${PLUGIN}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB + !isEmpty(PATH):!isEmpty(PLUGIN): LIBS *= -L$$PATH -l$${PLUGIN}$$qtPlatformTargetSuffix() } # create qml_plugin_import.cpp diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index f21848f941..c6fba7770f 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,21 +1,13 @@ QT_FOR_CONFIG += gui -defineTest(prependOpenGlLib) { - path = $$QT.core.libs/$$QMAKE_PREFIX_STATICLIB$$1 - ext = .$$QMAKE_EXTENSION_STATICLIB - QMAKE_LIBS_OPENGL_ES2 = $${path}$${ext} $$QMAKE_LIBS_OPENGL_ES2 - QMAKE_LIBS_OPENGL_ES2_DEBUG = $${path}d$${ext} $$QMAKE_LIBS_OPENGL_ES2_DEBUG - export(QMAKE_LIBS_OPENGL_ES2) - export(QMAKE_LIBS_OPENGL_ES2_DEBUG) -} - qtConfig(opengles2) { # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 qtConfig(combined-angle-lib) { - prependOpenGlLib($$LIBQTANGLE_NAME) + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG } else { - prependOpenGlLib($$LIBGLESV2_NAME) - prependOpenGlLib($$LIBEGL_NAME) + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG } # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..ecb167bf18 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -6,9 +6,10 @@ contains(TEMPLATE, ".*app") { qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { isEqual(entryLib, -lqtmain) { - lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB - PRE_TARGETDEPS += $$lib - QMAKE_LIBS += $$lib + !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ + QMAKE_LIBS += -L$$QT.core.libs + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d + else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} } else { QMAKE_LIBS += $${entryLib} } diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf index eb7b87b57b..80353cd5f6 100644 --- a/mkspecs/linux-lsb-g++/qmake.conf +++ b/mkspecs/linux-lsb-g++/qmake.conf @@ -13,6 +13,7 @@ load(qt_config) QMAKE_LIBS_THREAD += -lrt +QMAKE_LSB = 1 QMAKE_CC = lsbcc QMAKE_CXX = lsbc++ -- 2.21.0 ++++++ 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch ++++++ >From 71b2d89fd5e3427b767e29b5f0bb6d4ca41806fa Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Thu, 6 Jun 2019 20:05:37 +0200 Subject: [PATCH 2/3] Revert "Replace absolute Qt lib dir in .prl files" This reverts commit f00de3322e05c62021082463b6de24805afc1355. --- mkspecs/features/qt_common.prf | 2 -- 1 file changed, 2 deletions(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 17a07dbab9..e51aa4766b 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -49,8 +49,6 @@ contains(TEMPLATE, .*lib) { lib_replace.match = $$rplbase/lib lib_replace.replace = $$qqt_libdir } - !equals(qt_libdir, $$rplbase/lib): \ - lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\) lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace } -- 2.21.0 ++++++ 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch ++++++ --- /var/tmp/diff_new_pack.3lZMjl/_old 2019-06-28 16:32:11.906447458 +0200 +++ /var/tmp/diff_new_pack.3lZMjl/_new 2019-06-28 16:32:11.906447458 +0200 @@ -15,11 +15,11 @@ src/testlib/qtaptestlogger.cpp | 11 +---------- 7 files changed, 4 insertions(+), 50 deletions(-) -diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp -index 090436a3c7..6541b97595 100644 ---- a/src/corelib/kernel/qvariant.cpp -+++ b/src/corelib/kernel/qvariant.cpp -@@ -1052,13 +1052,11 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) +Index: qtbase-everywhere-src-5.13.0-beta2/src/corelib/kernel/qvariant.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/corelib/kernel/qvariant.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/corelib/kernel/qvariant.cpp +@@ -1052,13 +1052,11 @@ static bool convert(const QVariant::Priv return false; #ifndef QT_BOOTSTRAPPED @@ -33,7 +33,7 @@ case QMetaType::QJsonValue: switch (d->type) { case QMetaType::Nullptr: -@@ -1234,11 +1232,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) +@@ -1234,11 +1232,9 @@ static bool convert(const QVariant::Priv case QVariant::Url: *static_cast<QCborValue *>(result) = QCborValue(*v_cast<QUrl>(d)); break; @@ -45,11 +45,11 @@ case QVariant::Uuid: *static_cast<QCborValue *>(result) = QCborValue(*v_cast<QUuid>(d)); break; -diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp -index 80ef515fd2..e53b6a0326 100644 ---- a/src/corelib/serialization/qcborvalue.cpp -+++ b/src/corelib/serialization/qcborvalue.cpp -@@ -1771,7 +1771,6 @@ QCborValue::QCborValue(const QUrl &url) +Index: qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qcborvalue.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/corelib/serialization/qcborvalue.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qcborvalue.cpp +@@ -1772,7 +1772,6 @@ QCborValue::QCborValue(const QUrl &url) container->elements[1].type = String; } @@ -57,7 +57,7 @@ /*! Creates a QCborValue object of the regular expression pattern extended type and containing the value represented by \a rx. The value can later be retrieved -@@ -1790,7 +1789,6 @@ QCborValue::QCborValue(const QRegularExpression &rx) +@@ -1791,7 +1790,6 @@ QCborValue::QCborValue(const QRegularExp // change type t = RegularExpression; } @@ -65,7 +65,7 @@ /*! Creates a QCborValue object of the UUID extended type and containing the -@@ -1944,7 +1942,6 @@ QUrl QCborValue::toUrl(const QUrl &defaultValue) const +@@ -1945,7 +1943,6 @@ QUrl QCborValue::toUrl(const QUrl &defau return QUrl::fromEncoded(byteData->asByteArrayView()); } @@ -73,7 +73,7 @@ /*! Returns the regular expression value stored in this QCborValue, if it is of the regular expression pattern extended type. Otherwise, it returns \a -@@ -1963,7 +1960,6 @@ QRegularExpression QCborValue::toRegularExpression(const QRegularExpression &def +@@ -1964,7 +1961,6 @@ QRegularExpression QCborValue::toRegular Q_ASSERT(n == -1); return QRegularExpression(container->stringAt(1)); } @@ -81,7 +81,7 @@ /*! Returns the UUID value stored in this QCborValue, if it is of the UUID -@@ -2404,16 +2400,12 @@ uint qHash(const QCborValue &value, uint seed) +@@ -2874,16 +2870,12 @@ uint qHash(const QCborValue &value, uint return qHash(value.toDateTime(), seed); case QCborValue::Url: return qHash(value.toUrl(), seed); @@ -98,7 +98,7 @@ } Q_ASSERT(value.isSimpleType()); -@@ -2458,16 +2450,12 @@ static QDebug debugContents(QDebug &dbg, const QCborValue &v) +@@ -2928,16 +2920,12 @@ static QDebug debugContents(QDebug &dbg, return dbg << v.toDateTime(); case QCborValue::Url: return dbg << v.toUrl(); @@ -115,10 +115,10 @@ } if (v.isSimpleType()) return dbg << v.toSimpleType(); -diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h -index d6ba4e88d8..105af1ba73 100644 ---- a/src/corelib/serialization/qcborvalue.h -+++ b/src/corelib/serialization/qcborvalue.h +Index: qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qcborvalue.h +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/corelib/serialization/qcborvalue.h ++++ qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qcborvalue.h @@ -43,9 +43,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qdatetime.h> @@ -130,7 +130,7 @@ #include <QtCore/qstring.h> #include <QtCore/qstringview.h> #include <QtCore/qurl.h> -@@ -157,9 +155,7 @@ public: +@@ -159,9 +157,7 @@ public: explicit QCborValue(const QDateTime &dt); explicit QCborValue(const QUrl &url); @@ -140,7 +140,7 @@ explicit QCborValue(const QUuid &uuid); ~QCborValue() { if (container) dispose(); } -@@ -237,9 +233,7 @@ public: +@@ -239,9 +235,7 @@ public: QString toString(const QString &defaultValue = {}) const; QDateTime toDateTime(const QDateTime &defaultValue = {}) const; QUrl toUrl(const QUrl &defaultValue = {}) const; @@ -149,7 +149,7 @@ -#endif QUuid toUuid(const QUuid &defaultValue = {}) const; - #ifdef Q_QDOC + // only forward-declared, need split functions @@ -386,10 +380,8 @@ public: { return concrete().toDateTime(defaultValue); } QUrl toUrl(const QUrl &defaultValue = {}) const @@ -161,10 +161,10 @@ QUuid toUuid(const QUuid &defaultValue = {}) const { return concrete().toUuid(defaultValue); } -diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp -index 4f756df97c..158f1950d0 100644 ---- a/src/corelib/serialization/qjsoncbor.cpp -+++ b/src/corelib/serialization/qjsoncbor.cpp +Index: qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qjsoncbor.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/corelib/serialization/qjsoncbor.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/corelib/serialization/qjsoncbor.cpp @@ -543,19 +543,14 @@ QVariant QCborValue::toVariant() const case Url: return toUrl(); @@ -185,7 +185,7 @@ } if (isSimpleType()) -@@ -719,10 +714,8 @@ QCborValue QCborValue::fromVariant(const QVariant &variant) +@@ -719,10 +714,8 @@ QCborValue QCborValue::fromVariant(const case QVariant::Hash: return QCborMap::fromVariantHash(variant.toHash()); #ifndef QT_BOOTSTRAPPED @@ -196,10 +196,10 @@ case QMetaType::QJsonValue: return fromJsonValue(variant.toJsonValue()); case QMetaType::QJsonObject: -diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp -index 0a3a37863a..f151713400 100644 ---- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp -+++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +Index: qtbase-everywhere-src-5.13.0-beta2/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -51,9 +51,7 @@ #include <private/qguiapplication_p.h> #include <QScreen> @@ -211,10 +211,10 @@ #include <QLoggingCategory> #if defined(Q_OS_LINUX) -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 d42a33c22b..ddb8f45188 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +Index: qtbase-everywhere-src-5.13.0-beta2/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -48,9 +48,7 @@ #undef register #include <GL/glx.h> @@ -242,10 +242,10 @@ } if (!m_supportsThreading) { qCDebug(lcQpaGl).nospace() << "Multithreaded OpenGL disabled: " -diff --git a/src/testlib/qtaptestlogger.cpp b/src/testlib/qtaptestlogger.cpp -index 540b36e273..e73609de3d 100644 ---- a/src/testlib/qtaptestlogger.cpp -+++ b/src/testlib/qtaptestlogger.cpp +Index: qtbase-everywhere-src-5.13.0-beta2/src/testlib/qtaptestlogger.cpp +=================================================================== +--- qtbase-everywhere-src-5.13.0-beta2.orig/src/testlib/qtaptestlogger.cpp ++++ qtbase-everywhere-src-5.13.0-beta2/src/testlib/qtaptestlogger.cpp @@ -43,9 +43,7 @@ #include "qtestresult_p.h" #include "qtestassert.h" @@ -257,7 +257,7 @@ QT_BEGIN_NAMESPACE -@@ -150,7 +148,6 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description, +@@ -150,7 +148,6 @@ void QTapTestLogger::addIncident(Inciden outputString(YAML_INDENT "---\n"); if (type != XFail) { @@ -265,7 +265,7 @@ // This is fragile, but unfortunately testlib doesn't plumb // the expected and actual values to the loggers (yet). static QRegularExpression verifyRegex( -@@ -211,12 +208,6 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description, +@@ -211,12 +208,6 @@ void QTapTestLogger::addIncident(Inciden YAML_INDENT "# %s\n", description); outputString(unparsableDescription.data()); } @@ -278,6 +278,3 @@ } if (file) { --- -2.20.1 - ++++++ 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch ++++++ >From 34db59a076dd824401f952b305a4f575b0140f79 Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov <dimul...@gmail.com> Date: Mon, 11 Mar 2019 13:18:06 +0300 Subject: [PATCH 2/3] Synthesize Enter/LeaveEvent for accepted QTabletEvent When the tablet event is accepted, then Qt doesn't synthesize a mouse event, it means that QApplicationPrivate::sendMouseEvent() will not be called, and, therefore, enter/leave events will not be dispatched. The patch looks a bit hackish. Ideally, the synthesize should happen in QGuiApplicationPrivate::processTabletEvent(), which takes the decision about synthesizing mouse events. But there is not enough information on this level: neither qt_last_mouse_receiver nor the receiver widget are known at this stage. On Windows and other platforms where there is a parallel stream of mouse events synthesized by the platform, we shouldn't generate these events manually. Change-Id: Ifbad6284483ee282ad129db54606f5d0d9ddd633 --- src/widgets/kernel/qwidgetwindow.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index fbc71cd0ea..729a7f701a 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -1051,6 +1051,18 @@ void QWidgetWindow::handleTabletEvent(QTabletEvent *event) event->setAccepted(ev.isAccepted()); } + /** + * Synthesize Enter/Leave events if it is requested by the system and user + */ + if (widget != qt_last_mouse_receiver && + event->isAccepted() && + !QWindowSystemInterfacePrivate::TabletEvent::platformSynthesizesMouse && + qApp->testAttribute(Qt::AA_SynthesizeMouseForUnhandledTabletEvents)) { + + QApplicationPrivate::dispatchEnterLeave(widget, qt_last_mouse_receiver, event->globalPos()); + qt_last_mouse_receiver = widget; + } + if (event->type() == QEvent::TabletRelease && event->buttons() == Qt::NoButton) qt_tablet_target = 0; } -- 2.21.0 ++++++ 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch ++++++ >From d3506e73971e681c061edd3fb7c693ccd405c77c Mon Sep 17 00:00:00 2001 From: Dmitry Kazakov <dimul...@gmail.com> Date: Sun, 10 Mar 2019 14:51:28 +0300 Subject: [PATCH 3/3] Add an ID for recognition of UGEE tablets Change-Id: I2228ee9d53aa23a2d2cd9970a363d8424e744093 Reviewed-by: Frederik Gladhorn <frederik.gladh...@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutle...@qt.io> --- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index e4da207b00..bc09fe2f91 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -240,6 +240,10 @@ void QXcbConnection::xi2SetupDevice(void *info, bool removeExisting) } else if (name.contains("uc-logic") && isTablet) { tabletData.pointerType = QTabletEvent::Pen; dbgType = QLatin1String("pen"); + } else if (name.contains("ugee")) { + isTablet = true; + tabletData.pointerType = QTabletEvent::Pen; + dbgType = QLatin1String("pen"); } else { isTablet = false; } -- 2.21.0 ++++++ 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch ++++++ >From debbdd25835318dc4848488da4dc0acfd27b3332 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@ritter-vogt.de> Date: Thu, 6 Jun 2019 20:06:08 +0200 Subject: [PATCH 3/3] Revert "Fix prl replacements if libdir is in QMAKE_DEFAULT_LIBDIRS" This reverts commit d5071a4016ec663f8ec7c89ec7ebabea54b3260f. --- mkspecs/features/qt_common.prf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index e51aa4766b..843916b3b1 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -39,10 +39,6 @@ contains(TEMPLATE, .*lib) { qt_libdir = $$[QT_INSTALL_LIBS] } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { - lib_replace0.match = $$rplbase/lib/ - lib_replace0.replace = $$qqt_libdir/ - lib_replace0.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace0 lib_replace.match = "[^ ']*$$rplbase/lib" lib_replace.replace = } else { -- 2.21.0 ++++++ qtbase-everywhere-src-5.12.3.tar.xz -> qtbase-everywhere-src-5.13.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.12.3.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4615/qtbase-everywhere-src-5.13.0.tar.xz differ: char 26, line 1
