Date: Tuesday, July 11, 2017 @ 04:59:29 Author: felixonmars Revision: 243843
upgpkg: deepin-qt5integration 0.2.1-1 Added: deepin-qt5integration/trunk/qt-5.9.patch Modified: deepin-qt5integration/trunk/PKGBUILD --------------+ PKGBUILD | 12 +++++++----- qt-5.9.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-11 04:59:11 UTC (rev 243842) +++ PKGBUILD 2017-07-11 04:59:29 UTC (rev 243843) @@ -2,8 +2,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=deepin-qt5integration -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc='Deepin Qt5 platform plugin' arch=('i686' 'x86_64') url="http://github.com/linuxdeepin/qt5integration"; @@ -14,13 +14,15 @@ conflicts=('qt5dxcb-plugin') groups=('deepin') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"; - use-system-qt5-headers.patch) -sha512sums=('3425cde5fe1653e30353e58f0dd66896045fa5c3b84b8c5da3c24d3ec01c84be4dbad9117f26d2a6e02dec0aa06d0445411bd6c180b23cbdc924ee474c8fe1c2' - '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b') + use-system-qt5-headers.patch qt-5.9.patch) +sha512sums=('833d9716f10a5dbe7de19f5dc6ef2b11af3baac9108b96ab09b38f2dd71471257a26a4947bd0ff2f2258b7b35c66a3c298284aba269c327f1a255f98829e9989' + '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b' + 'b5c8a41184e5fd4d9bc6b7b3f1028181e1c98b5c2ca6cc072efcd49b643844f7999b13de66ffdf0260825ae1e1921437476d4865c96043dd376a4c452536379c') prepare() { cd qt5integration-$pkgver patch -p1 -i ../use-system-qt5-headers.patch + patch -p1 -i ../qt-5.9.patch } build() { Added: qt-5.9.patch =================================================================== --- qt-5.9.patch (rev 0) +++ qt-5.9.patch 2017-07-11 04:59:29 UTC (rev 243843) @@ -0,0 +1,46 @@ +commit c07d348bae9bbb96dcecd682ff50e2e31fdffc48 +Author: Felix Yan <[email protected]> +Date: Tue Jul 11 12:46:16 2017 +0800 + + Fix compatibility with Qt 5.9 + + Change-Id: I53f07a89ff49c69a40e06ae91fc4b6e431280630 + +diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp +index 3145836..1700d6a 100644 +--- a/platformplugin/dplatformwindowhelper.cpp ++++ b/platformplugin/dplatformwindowhelper.cpp +@@ -314,10 +314,17 @@ bool DPlatformWindowHelper::isExposed() const + return me()->m_frameWindow->handle()->isExposed(); + } + ++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) ++bool DPlatformWindowHelper::isEmbedded() const ++{ ++ return me()->m_frameWindow->handle()->isEmbedded(); ++} ++#else + bool DPlatformWindowHelper::isEmbedded(const QPlatformWindow *parentWindow) const + { + return me()->m_frameWindow->handle()->isEmbedded(parentWindow); + } ++#endif + + void DPlatformWindowHelper::propagateSizeHints() + { +diff --git a/platformplugin/dplatformwindowhelper.h b/platformplugin/dplatformwindowhelper.h +index 4c2f367..843aecc 100644 +--- a/platformplugin/dplatformwindowhelper.h ++++ b/platformplugin/dplatformwindowhelper.h +@@ -60,7 +60,11 @@ public: + + bool isExposed() const; + bool isActive() const; ++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) ++ bool isEmbedded() const; ++#else + bool isEmbedded(const QPlatformWindow *parentWindow = 0) const; ++#endif + + void propagateSizeHints(); +
