Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-5.15.1

Browse Source
This commit is contained in:
Rmys
2020-09-09 19:21:33 +03:00
parent 495a13b566
commit 732dfdd0af
11 changed files with 171 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-tools/files/qt5-tools-qtwebkit.patch
+32
View File
@@ -0,0 +1,32 @@
From 3c30956e65a98706d283d44e07fd481a1849f74e Mon Sep 17 00:00:00 2001
From: Alexander Volkov <avolkov@astralinux.ru>
Date: Tue, 26 May 2020 22:20:31 +0300
Subject: Assistant: Fix build with qtwebkit
Amend b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e.
Don't declare HelpViewer::resizeEvent() when HelpViewer
is inherited from QWebView to avoid linker error.
Change-Id: Ib4ca6823cf17c238eb08ecc531870d66db202269
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
---
src/assistant/assistant/helpviewer.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index fa954cc9f..acd38c66e 100644
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -130,7 +130,9 @@ protected:
void wheelEvent(QWheelEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
+#if defined(BROWSER_QTEXTBROWSER)
void resizeEvent(QResizeEvent *e) override;
+#endif
private slots:
void actionChanged();
--
cgit v1.2.1
desktop/toolkit/qt5/qt5-tools/pspec.xml
+18 -8
View File
@@ -11,15 +11,18 @@
<Summary>A cross-platform application and UI framework (Development Tools, QtHelp)</Summary>
<Description>A cross-platform application and UI framework (Development Tools, QtHelp)</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="172794608668d772c9ad6cd289bb84e0b3336999" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz</Archive>
<Archive sha1sum="613573645c85972c9dc2ddcd4dddf228f5f68462" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>llvm</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qt5-tools-qtwebkit.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -28,8 +31,8 @@
<Dependency>libgcc</Dependency>
<Dependency>llvm-libs</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/qdistancefieldgenerator</Path>
@@ -66,7 +69,7 @@
<Package>
<Name>qt5-assistant-devel</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency release="current">qt5-assistant</Dependency>
<Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency>
</RuntimeDependencies>
@@ -82,8 +85,8 @@
<Name>qt5-designer</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/designer</Path>
@@ -182,6 +185,13 @@
</Package>
<History>
<Update release="24">
<Date>2020-09-09</Date>
<Version>5.15.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="23">
<Date>2020-04-04</Date>
<Version>5.14.2</Version>