diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c8eea1f..0625d5a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -351,7 +351,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. ## upstream fixes %patch4 -p1 -b .QTBUG-35459 -patch8 -p1 +%patch8 -p1 -b .tell-the-truth-about-private-api %patch50 -p1 -b .QT_VERSION_CHECK %patch51 -p1 -b .hidpi_scale_at_192 diff --git a/tell-the-truth-about-private-api.patch b/tell-the-truth-about-private-api.patch index b44974a..2dbced4 100644 --- a/tell-the-truth-about-private-api.patch +++ b/tell-the-truth-about-private-api.patch @@ -1,10 +1,10 @@ diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index f6cbf99..798472a 100644 +index e6a0d97..cf93041 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -214,9 +214,9 @@ android: CONFIG += qt_android_deps no_linker_version_script +@@ -216,9 +216,9 @@ android: CONFIG += qt_android_deps no_linker_version_script QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript - + internal_module { - verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" + verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };" @@ -12,5 +12,5 @@ index f6cbf99..798472a 100644 - verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ + verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \ " qt_private_api_tag*;" - + private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES