Accepting request 505943 from KDE:Qt5

- Use the correct (edited) version of the revert to not break ABI:
  * de63bbd2f806b0219a60775017899cedb121581f.patch
(Ironically this change breaks private ABI yet again...)

- Add upstream patch to fix version string of CMake modules (boo#1045102)
  * fix-cmake-module-version.patch

OBS-URL: https://build.opensuse.org/request/show/505943
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2017-06-29 12:59:43 +00:00 committed by Git OBS Bridge
parent a0119ff1d2
commit 048abb8e9c
4 changed files with 50 additions and 70 deletions

View File

@ -16,78 +16,9 @@ now it's Cmd-Delete).
Change-Id: I6b56f68f37670962178693a8983d9fe550540856 Change-Id: I6b56f68f37670962178693a8983d9fe550540856
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
--- ---
src/gui/kernel/qplatformtheme.cpp | 13 +++++++++++++
src/gui/kernel/qplatformtheme.h | 1 +
src/plugins/platforms/cocoa/qcocoatheme.h | 1 +
src/plugins/platforms/cocoa/qcocoatheme.mm | 6 ++++++
src/widgets/widgets/qdialogbuttonbox.cpp | 7 +------ src/widgets/widgets/qdialogbuttonbox.cpp | 7 +------
5 files changed, 22 insertions(+), 6 deletions(-) 5 files changed, 22 insertions(+), 6 deletions(-)
Index: qtbase-opensource-src-5.9.0/src/gui/kernel/qplatformtheme.cpp
===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/gui/kernel/qplatformtheme.cpp
+++ qtbase-opensource-src-5.9.0/src/gui/kernel/qplatformtheme.cpp
@@ -678,19 +678,6 @@ QString QPlatformTheme::standardButtonTe
return QPlatformTheme::defaultStandardButtonText(button);
}
-/*!
- Returns the mnemonic that should be used for a standard \a button.
-
- \since 5.9
- \sa QPlatformDialogHelper::StandardButton
- */
-
-QKeySequence QPlatformTheme::standardButtonShortcut(int button) const
-{
- Q_UNUSED(button)
- return QKeySequence();
-}
-
QString QPlatformTheme::defaultStandardButtonText(int button)
{
switch (button) {
Index: qtbase-opensource-src-5.9.0/src/gui/kernel/qplatformtheme.h
===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/gui/kernel/qplatformtheme.h
+++ qtbase-opensource-src-5.9.0/src/gui/kernel/qplatformtheme.h
@@ -312,7 +312,6 @@ public:
#endif
virtual QString standardButtonText(int button) const;
- virtual QKeySequence standardButtonShortcut(int button) const;
static QVariant defaultThemeHint(ThemeHint hint);
static QString defaultStandardButtonText(int button);
Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/cocoa/qcocoatheme.h
===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/cocoa/qcocoatheme.h
+++ qtbase-opensource-src-5.9.0/src/plugins/platforms/cocoa/qcocoatheme.h
@@ -74,7 +74,6 @@ public:
QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
QString standardButtonText(int button) const Q_DECL_OVERRIDE;
- QKeySequence standardButtonShortcut(int button) const Q_DECL_OVERRIDE;
static const char *name;
Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/cocoa/qcocoatheme.mm
===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ qtbase-opensource-src-5.9.0/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -344,12 +344,6 @@ QString QCocoaTheme::standardButtonText(
return button == QPlatformDialogHelper::Discard ? msgDialogButtonDiscard() : QPlatformTheme::standardButtonText(button);
}
-QKeySequence QCocoaTheme::standardButtonShortcut(int button) const
-{
- return button == QPlatformDialogHelper::Discard ? QKeySequence(Qt::CTRL | Qt::Key_Delete)
- : QPlatformTheme::standardButtonShortcut(button);
-}
-
QPlatformMenuItem *QCocoaTheme::createPlatformMenuItem() const
{
return new QCocoaMenuItem();
Index: qtbase-opensource-src-5.9.0/src/widgets/widgets/qdialogbuttonbox.cpp Index: qtbase-opensource-src-5.9.0/src/widgets/widgets/qdialogbuttonbox.cpp
=================================================================== ===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/widgets/widgets/qdialogbuttonbox.cpp --- qtbase-opensource-src-5.9.0.orig/src/widgets/widgets/qdialogbuttonbox.cpp

View File

@ -0,0 +1,34 @@
From cb4bc34cb150d02889f5be2e54074e4e864b18ae Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 22 May 2017 11:17:28 +0200
Subject: [PATCH] fix module version number in qt modules' cmake config files
this actually just makes the code more straight-forward.
amends f8607045c.
Task-number: QTBUG-60936
Change-Id: Iaa05b474206cf29352f9bba516936ff30b90a778
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 4f342d6..17da8b9 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -35,7 +35,7 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
!!IF !equals(TEMPLATE, aux)
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
+set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF // TEMPLATE != aux
--
2.7.4

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jun 22 15:02:38 UTC 2017 - fabian@ritter-vogt.de
- Use the correct (edited) version of the revert to not break ABI:
* de63bbd2f806b0219a60775017899cedb121581f.patch
-------------------------------------------------------------------
Tue Jun 20 15:07:06 UTC 2017 - fabian@ritter-vogt.de
- Add upstream patch to fix version string of CMake modules (boo#1045102)
* fix-cmake-module-version.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 6 10:19:48 UTC 2017 - alarrosa@suse.com Tue Jun 6 10:19:48 UTC 2017 - alarrosa@suse.com

View File

@ -61,8 +61,10 @@ Patch13: 0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
# patches 1000-2000 and above from upstream 5.9 branch # # patches 1000-2000 and above from upstream 5.9 branch #
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch1000: native-children-hidpi-offset.patch Patch1000: native-children-hidpi-offset.patch
# PATCH-FIX-UPSTREAM Revert to workaround QTBUG-61140 # PATCH-FIX-UPSTREAM
Patch1001: dont-destroy-foreign-windows.patch Patch1001: dont-destroy-foreign-windows.patch
# PATCH-FIX-UPSTREAM
Patch1002: fix-cmake-module-version.patch
# patches 2000-3000 and above from upstream 5.10/dev branch # # patches 2000-3000 and above from upstream 5.10/dev branch #
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: cups-devel BuildRequires: cups-devel
@ -154,6 +156,7 @@ handling.
%patch13 -p1 %patch13 -p1
%patch1000 -p1 %patch1000 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1
# be sure not to use them # be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,zlib} rm -rf src/3rdparty/{libjpeg,freetype,zlib}