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

Merge pull request #12050 from Rmys/master

Browse Source 
qt5-5.15.10
This commit is contained in:
Rmys
2023-06-18 07:52:49 +00:00
committed by GitHub
parent cbdbb39b15 03e757db3c
commit 7a5aace783
11 changed files with 473 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-3d/pspec.xml
+16 -9
View File
@@ -15,24 +15,24 @@
<PartOf>desktop</PartOf> <PartOf>desktop</PartOf>
<Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary> <Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary>
<Description>C++ and QML APIs for easy inclusion of 3D graphics</Description> <Description>C++ and QML APIs for easy inclusion of 3D graphics</Description>
<Archive sha1sum="270c5afb84242b63eaac960bba1645f39f6ca009" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qt3d-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="be9010126c921be36748be877cb53d6318ac50c4" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qt3d-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
<Dependency versionFrom="3.3.1">assimp-devel</Dependency> <Dependency versionFrom="3.3.1">assimp-devel</Dependency>
<Dependency>vulkan-headers</Dependency> <Dependency>vulkan-headers</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<!-- <Dependency versionFrom="5.15.9">qt5-xmlpatterns-devel</Dependency> --> <!-- <Dependency versionFrom="5.15.10">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.9">qt5-imageformats</Dependency> --> <!-- <Dependency versionFrom="5.15.10">qt5-imageformats</Dependency> -->
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>qt5-3d</Name> <Name>qt5-3d</Name>
<Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary> <Summary>C++ and QML APIs for easy inclusion of 3D graphics</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="3.3.1">assimp</Dependency> <Dependency versionFrom="3.3.1">assimp</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
@@ -48,8 +48,8 @@
<Name>qt5-3d-devel</Name> <Name>qt5-3d-devel</Name>
<Summary>Development files for qt5-3d</Summary> <Summary>Development files for qt5-3d</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
<Dependency release="current">qt5-3d</Dependency> <Dependency release="current">qt5-3d</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -60,6 +60,13 @@
</Package> </Package>
<History> <History>
<Update release="22">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="21"> <Update release="21">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-accountsservice/pspec.xml
+12 -5
View File
@@ -15,8 +15,8 @@
<BuildDependencies> <BuildDependencies>
<Dependency>liri-cmake-shared</Dependency> <Dependency>liri-cmake-shared</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -24,8 +24,8 @@
<Name>qt5-accountsservice</Name> <Name>qt5-accountsservice</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="5.15.7">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.7">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
@@ -45,12 +45,19 @@
<Path fileType="library">/usr/lib/pkgconfig</Path> <Path fileType="library">/usr/lib/pkgconfig</Path>
</Files> </Files>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency release="current">qt5-accountsservice</Dependency> <Dependency release="current">qt5-accountsservice</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
</Package> </Package>
<History> <History>
<Update release="26">
<Date>2023-06-17</Date>
<Version>1.3.0</Version>
<Comment>Rebuild qt5-5.15.10</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="25"> <Update release="25">
<Date>2022-12-21</Date> <Date>2022-12-21</Date>
<Version>1.3.0</Version> <Version>1.3.0</Version>
desktop/toolkit/qt5/qt5-canvas3d/pspec.xml
+11 -4
View File
@@ -17,16 +17,16 @@
<Description>A JavaScript 3D rendering API for Qt Quick</Description> <Description>A JavaScript 3D rendering API for Qt Quick</Description>
<Archive sha1sum="a085bbf2c30ad10c0661c801f0871ff33d05631d" type="targz">https://github.com/qt/qtcanvas3d/archive/refs/tags/v5.12.12.tar.gz</Archive> <Archive sha1sum="a085bbf2c30ad10c0661c801f0871ff33d05631d" type="targz">https://github.com/qt/qtcanvas3d/archive/refs/tags/v5.12.12.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>qt5-canvas3d</Name> <Name>qt5-canvas3d</Name>
<Summary>A JavaScript 3D rendering API for Qt Quick</Summary> <Summary>A JavaScript 3D rendering API for Qt Quick</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.7">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.7">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -35,6 +35,13 @@
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="20">
<Date>2023-06-17</Date>
<Version>5.12.12</Version>
<Comment>Rebuild qt-5.15.10.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="19"> <Update release="19">
<Date>2022-12-21</Date> <Date>2022-12-21</Date>
<Version>5.12.12</Version> <Version>5.12.12</Version>
desktop/toolkit/qt5/qt5-charts/pspec.xml
+13 -6
View File
@@ -11,18 +11,18 @@
<License>GPL3</License> <License>GPL3</License>
<Summary>Provides a set of easy to use chart components</Summary> <Summary>Provides a set of easy to use chart components</Summary>
<Description>Provides a set of easy to use chart components</Description> <Description>Provides a set of easy to use chart components</Description>
<Archive sha1sum="a6eb027d36dd821c113322b489d12bbc4edc807c" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtcharts-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="e9fcffcd1a83792c23b8432ddac50bf6b763917f" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtcharts-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>qt5-charts</Name> <Name>qt5-charts</Name>
<Summary>Provides a set of easy to use chart components</Summary> <Summary>Provides a set of easy to use chart components</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -36,7 +36,7 @@
<Name>qt5-charts-devel</Name> <Name>qt5-charts-devel</Name>
<Summary>Development files for qt5-charts</Summary> <Summary>Development files for qt5-charts</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency release="current">qt5-charts</Dependency> <Dependency release="current">qt5-charts</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -47,6 +47,13 @@
</Package> </Package>
<History> <History>
<Update release="21">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20"> <Update release="20">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-datavis3d/pspec.xml
+14 -7
View File
@@ -12,18 +12,18 @@
<PartOf>desktop</PartOf> <PartOf>desktop</PartOf>
<Summary>Provides a set of easy to use chart components</Summary> <Summary>Provides a set of easy to use chart components</Summary>
<Description>Qt Data Visualization module</Description> <Description>Qt Data Visualization module</Description>
<Archive sha1sum="20ed92f46a5c53e610ab4b65b20dd9ef32dd1eef" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtdatavis3d-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="567b4d3cfb0a9959d63d2ecf9b8e09cd5f55b58c" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdatavis3d-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>qt5-datavis3d</Name> <Name>qt5-datavis3d</Name>
<Summary>Qt Data Visualization module</Summary> <Summary>Qt Data Visualization module</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -37,8 +37,8 @@
<Name>qt5-datavis3d-devel</Name> <Name>qt5-datavis3d-devel</Name>
<Summary>Development files for qt5-datavis3d</Summary> <Summary>Development files for qt5-datavis3d</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
<Dependency release="current">qt5-datavis3d</Dependency> <Dependency release="current">qt5-datavis3d</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -49,6 +49,13 @@
</Package> </Package>
<History> <History>
<Update release="21">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20"> <Update release="20">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-gamepad/pspec.xml
+13 -6
View File
@@ -15,12 +15,12 @@
<PartOf>desktop</PartOf> <PartOf>desktop</PartOf>
<Summary>A JavaScript 3D rendering API for Qt Quick</Summary> <Summary>A JavaScript 3D rendering API for Qt Quick</Summary>
<Description>Adds support for getting events from gamepad devices</Description> <Description>Adds support for getting events from gamepad devices</Description>
<Archive sha1sum="03bf9d41b60d84d939fbc26d292a0d65e92b8ad3" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtgamepad-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="ac849c01dc833c4476cb2c07eeceab114bda68ed" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtgamepad-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>eudev-devel</Dependency> <Dependency>eudev-devel</Dependency>
<Dependency>libsdl2-devel</Dependency> <Dependency>libsdl2-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
@@ -30,8 +30,8 @@
<Dependency>eudev</Dependency> <Dependency>eudev</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>libsdl2</Dependency> <Dependency>libsdl2</Dependency>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
@@ -45,7 +45,7 @@
<Name>qt5-gamepad-devel</Name> <Name>qt5-gamepad-devel</Name>
<Summary>Development files for qt5-gamepad</Summary> <Summary>Development files for qt5-gamepad</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency release="current">qt5-gamepad</Dependency> <Dependency release="current">qt5-gamepad</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -56,6 +56,13 @@
</Package> </Package>
<History> <History>
<Update release="21">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20"> <Update release="20">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-scxml/pspec.xml
+14 -7
View File
@@ -14,18 +14,18 @@
<License>LGPL3</License> <License>LGPL3</License>
<Summary>Provides a set of easy to use chart components</Summary> <Summary>Provides a set of easy to use chart components</Summary>
<Description>Provides a set of easy to use chart components</Description> <Description>Provides a set of easy to use chart components</Description>
<Archive sha1sum="0c3151ef5b3a2aa549d80c79d68b38fa3aeb9f4d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtscxml-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="43ce223e4c0656e9c8a13e3eeb6e1c81515ce7f7" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtscxml-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>qt5-scxml</Name> <Name>qt5-scxml</Name>
<Summary>Provides a set of easy to use chart components</Summary> <Summary>Provides a set of easy to use chart components</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -41,8 +41,8 @@
<Summary>Development files for qt5-scxml</Summary> <Summary>Development files for qt5-scxml</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">qt5-scxml</Dependency> <Dependency release="current">qt5-scxml</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include/qt5</Path> <Path fileType="header">/usr/include/qt5</Path>
@@ -52,6 +52,13 @@
</Package> </Package>
<History> <History>
<Update release="21">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20"> <Update release="20">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch
+91
View File
@@ -1,3 +1,15 @@
diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
index 800c4a38d..7556f451b 100644
--- a/src/assistant/help/help.pro
+++ b/src/assistant/help/help.pro
@@ -1,7 +1,6 @@
TARGET = QtHelp
QT = core-private gui widgets sql
-QT_PRIVATE = network
DEFINES += QHELP_LIB
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index feab1e2d5..cbfb82507 100644 index feab1e2d5..cbfb82507 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp --- a/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -13,3 +25,82 @@ index feab1e2d5..cbfb82507 100644
m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable " m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
"VALUES(?, ?)")); "VALUES(?, ?)"));
m_query->bindValue(0, filterSetId); m_query->bindValue(0, filterSetId);
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index bb22000c8..415347a00 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,4 +1,4 @@
-QT += network help-private
+QT += help-private
QTPLUGIN.platforms = qminimal
QTPLUGIN.sqldrivers = qsqlite
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
index 6a45e57be..0ccf59f3c 100644
--- a/src/linguist/Qt5LinguistToolsMacros.cmake
+++ b/src/linguist/Qt5LinguistToolsMacros.cmake
@@ -68,6 +68,7 @@ function(QT5_CREATE_TRANSLATION _qm_files)
if(NOT EXISTS "${stamp_file_dir}")
file(MAKE_DIRECTORY "${stamp_file_dir}")
endif()
+ set(stamp_files "")
foreach(_ts_file ${_my_tsfiles})
get_filename_component(_ts_name ${_ts_file} NAME)
if(_my_sources)
@@ -95,7 +96,14 @@ function(QT5_CREATE_TRANSLATION _qm_files)
file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
endif()
- set(stamp_file "${stamp_file_dir}/${_ts_name}.stamp")
+ file(RELATIVE_PATH _ts_relative_path ${CMAKE_CURRENT_SOURCE_DIR} ${_ts_file})
+ string(REPLACE "../" "__/" _ts_relative_path "${_ts_relative_path}")
+ set(stamp_file "${stamp_file_dir}/${_ts_relative_path}.stamp")
+ list(APPEND stamp_files ${stamp_file})
+ get_filename_component(full_stamp_file_dir "${stamp_file}" DIRECTORY)
+ if(NOT EXISTS "${full_stamp_file_dir}")
+ file(MAKE_DIRECTORY "${full_stamp_file_dir}")
+ endif()
add_custom_command(OUTPUT ${stamp_file}
COMMAND ${Qt5_LUPDATE_EXECUTABLE}
ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
@@ -103,7 +111,7 @@ function(QT5_CREATE_TRANSLATION _qm_files)
DEPENDS ${_dependencies}
VERBATIM)
endforeach()
- qt5_add_translation(${_qm_files} __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE ${_my_tsfiles})
+ qt5_add_translation(${_qm_files} ${_my_tsfiles} __QT_INTERNAL_TIMESTAMP_FILES ${stamp_files})
set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)
endfunction()
@@ -120,17 +128,17 @@ endif()
function(QT5_ADD_TRANSLATION _qm_files)
- set(options __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ set(options)
set(oneValueArgs)
- set(multiValueArgs OPTIONS)
+ set(multiValueArgs OPTIONS __QT_INTERNAL_TIMESTAMP_FILES)
cmake_parse_arguments(_LRELEASE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(_lrelease_files ${_LRELEASE_UNPARSED_ARGUMENTS})
+ set(idx 0)
foreach(_current_FILE ${_lrelease_files})
get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
get_filename_component(qm ${_abs_FILE} NAME)
- set(ts_stamp_file "${CMAKE_CURRENT_BINARY_DIR}/.lupdate/${qm}.stamp")
# everything before the last dot has to be considered the file name (including other dots)
string(REGEX REPLACE "\\.[^.]*$" "" FILE_NAME ${qm})
get_source_file_property(output_location ${_abs_FILE} OUTPUT_LOCATION)
@@ -141,7 +149,9 @@ function(QT5_ADD_TRANSLATION _qm_files)
set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm")
endif()
- if(_LRELEASE___QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+ if(_LRELEASE___QT_INTERNAL_TIMESTAMP_FILES)
+ list(GET _LRELEASE___QT_INTERNAL_TIMESTAMP_FILES ${idx} ts_stamp_file)
+ math(EXPR idx "${idx} + 1")
set(qm_dep "${ts_stamp_file}")
else()
set(qm_dep "${_abs_FILE}")
desktop/toolkit/qt5/qt5-tools/pspec.xml
+15 -8
View File
@@ -11,15 +11,15 @@
<Summary>A cross-platform application and UI framework (Development Tools, QtHelp)</Summary> <Summary>A cross-platform application and UI framework (Development Tools, QtHelp)</Summary>
<Description>A cross-platform application and UI framework (Development Tools, QtHelp)</Description> <Description>A cross-platform application and UI framework (Development Tools, QtHelp)</Description>
<License>LGPLv2.1-linking-exception</License> <License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="f2252757e6eadbdb34995bbef404db12ff76c62c" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="c9fa9d06551a8e076c3e29e27dbf8465c677e78a" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>llvm</Dependency> <Dependency>llvm</Dependency>
<Dependency versionFrom="21.1.2">mesa-devel</Dependency> <Dependency versionFrom="21.1.2">mesa-devel</Dependency>
<Dependency versionFrom="12.0.0">llvm-clang-devel</Dependency> <Dependency versionFrom="12.0.0">llvm-clang-devel</Dependency>
<Dependency versionFrom="12.0.0">lld-devel</Dependency> <Dependency versionFrom="12.0.0">lld-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency> <Dependency>icon-theme-hicolor</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">qt_kde.patch</Patch> <Patch level="1">qt_kde.patch</Patch>
@@ -32,8 +32,8 @@
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>llvm-libs</Dependency> <Dependency>llvm-libs</Dependency>
<Dependency>llvm-clang</Dependency> <Dependency>llvm-clang</Dependency>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/qdistancefieldgenerator</Path> <Path fileType="executable">/usr/bin/qdistancefieldgenerator</Path>
@@ -70,7 +70,7 @@
<Package> <Package>
<Name>qt5-assistant-devel</Name> <Name>qt5-assistant-devel</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency release="current">qt5-assistant</Dependency> <Dependency release="current">qt5-assistant</Dependency>
<Dependency versionFrom="10.0.1">llvm-clang-devel</Dependency> <Dependency versionFrom="10.0.1">llvm-clang-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
@@ -86,8 +86,8 @@
<Name>qt5-designer</Name> <Name>qt5-designer</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/designer</Path> <Path fileType="executable">/usr/bin/designer</Path>
@@ -188,6 +188,13 @@
</Package> </Package>
<History> <History>
<Update release="39">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="38"> <Update release="38">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>
desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch
+8 -54
View File
@@ -2390,7 +2390,7 @@ index 261f8cbb..c1bcd5c6 100644
private: private:
QScopedPointer<QWaylandXdgShellV6> m_xdgShell; QScopedPointer<QWaylandXdgShellV6> m_xdgShell;
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index f50e1c0e..822b385c 100644 index fa9c01aa..822b385c 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -67,11 +67,6 @@ QWaylandXdgSurface::Toplevel::Toplevel(QWaylandXdgSurface *xdgSurface) @@ -67,11 +67,6 @@ QWaylandXdgSurface::Toplevel::Toplevel(QWaylandXdgSurface *xdgSurface)
@@ -2457,7 +2457,7 @@ index f50e1c0e..822b385c 100644
} }
QWaylandXdgSurface::Popup::~Popup() QWaylandXdgSurface::Popup::~Popup()
@@ -216,10 +213,24 @@ QWaylandXdgSurface::Popup::~Popup() @@ -216,10 +213,14 @@ QWaylandXdgSurface::Popup::~Popup()
if (isInitialized()) if (isInitialized())
destroy(); destroy();
@@ -2470,20 +2470,10 @@ index f50e1c0e..822b385c 100644
Q_ASSERT(shell->m_topmostGrabbingPopup == this); Q_ASSERT(shell->m_topmostGrabbingPopup == this);
- shell->m_topmostGrabbingPopup = m_parent->m_popup; - shell->m_topmostGrabbingPopup = m_parent->m_popup;
+ shell->m_topmostGrabbingPopup = m_parentXdgSurface ? m_parentXdgSurface->m_popup : nullptr; + shell->m_topmostGrabbingPopup = m_parentXdgSurface ? m_parentXdgSurface->m_popup : nullptr;
+ m_grabbing = false; m_grabbing = false;
+
+ // Synthesize Qt enter/leave events for popup
+ QWindow *leave = nullptr;
+ if (m_xdgSurface && m_xdgSurface->window())
+ leave = m_xdgSurface->window()->window();
+ QWindowSystemInterface::handleLeaveEvent(leave);
+
+ if (QWindow *enter = QGuiApplication::topLevelAt(QCursor::pos()))
+ QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
}
}
@@ -257,6 +268,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *s // Synthesize Qt enter/leave events for popup
@@ -267,6 +268,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *s
m_toplevel->set_parent(parentXdgSurface->m_toplevel->object()); m_toplevel->set_parent(parentXdgSurface->m_toplevel->object());
} }
} }
@@ -2491,7 +2481,7 @@ index f50e1c0e..822b385c 100644
} }
QWaylandXdgSurface::~QWaylandXdgSurface() QWaylandXdgSurface::~QWaylandXdgSurface()
@@ -372,10 +384,10 @@ void QWaylandXdgSurface::setSizeHints() @@ -382,10 +384,10 @@ void QWaylandXdgSurface::setSizeHints()
const int minHeight = qMax(0, m_window->windowMinimumSize().height()); const int minHeight = qMax(0, m_window->windowMinimumSize().height());
m_toplevel->set_min_size(minWidth, minHeight); m_toplevel->set_min_size(minWidth, minHeight);
@@ -2504,7 +2494,7 @@ index f50e1c0e..822b385c 100644
if (maxHeight == QWINDOWSIZE_MAX) if (maxHeight == QWINDOWSIZE_MAX)
maxHeight = 0; maxHeight = 0;
m_toplevel->set_max_size(maxWidth, maxHeight); m_toplevel->set_max_size(maxWidth, maxHeight);
@@ -400,8 +412,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent) @@ -410,8 +412,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
{ {
Q_ASSERT(!m_toplevel && !m_popup); Q_ASSERT(!m_toplevel && !m_popup);
@@ -2513,7 +2503,7 @@ index f50e1c0e..822b385c 100644
auto positioner = new QtWayland::xdg_positioner(m_shell->create_positioner()); auto positioner = new QtWayland::xdg_positioner(m_shell->create_positioner());
// set_popup expects a position relative to the parent // set_popup expects a position relative to the parent
QPoint transientPos = m_window->geometry().topLeft(); // this is absolute QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
@@ -415,11 +425,10 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent) @@ -425,11 +425,10 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right); positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
positioner->set_size(m_window->geometry().width(), m_window->geometry().height()); positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
positioner->set_constraint_adjustment(QtWayland::xdg_positioner::constraint_adjustment_slide_x positioner->set_constraint_adjustment(QtWayland::xdg_positioner::constraint_adjustment_slide_x
@@ -2528,30 +2518,6 @@ index f50e1c0e..822b385c 100644
delete positioner; delete positioner;
} }
@@ -441,6 +450,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
}
setPopup(parent);
m_popup->grab(device, serial);
+
+ // Synthesize Qt enter/leave events for popup
+ if (!parent)
+ return;
+ QWindow *current = QGuiApplication::topLevelAt(QCursor::pos());
+ QWindow *leave = parent->window();
+ if (current != leave)
+ return;
+
+ QWindowSystemInterface::handleLeaveEvent(leave);
+
+ QWindow *enter = nullptr;
+ if (m_popup && m_popup->m_xdgSurface && m_popup->m_xdgSurface->window())
+ enter = m_popup->m_xdgSurface->window()->window();
+
+ if (enter)
+ QWindowSystemInterface::handleEnterEvent(enter, enter->mapFromGlobal(QCursor::pos()), QCursor::pos());
}
void QWaylandXdgSurface::xdg_surface_configure(uint32_t serial)
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
index 96785205..4b518f0a 100644 index 96785205..4b518f0a 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
@@ -2693,18 +2659,6 @@ index 9312c2e5..2ea382f1 100644
+ +
QCOMPOSITOR_TEST_MAIN(tst_seatv5) QCOMPOSITOR_TEST_MAIN(tst_seatv5)
#include "tst_seatv5.moc" #include "tst_seatv5.moc"
diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
index 5c6c83ba..fa9b7662 100644
--- a/tests/auto/client/shared/corecompositor.cpp
+++ b/tests/auto/client/shared/corecompositor.cpp
@@ -27,6 +27,7 @@
****************************************************************************/
#include "corecompositor.h"
+#include <thread>
namespace MockCompositor {
diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp
index 0d988521..53e12291 100644 index 0d988521..53e12291 100644
--- a/tests/auto/client/shared/coreprotocol.cpp --- a/tests/auto/client/shared/coreprotocol.cpp
desktop/toolkit/qt5/qt5-wayland/pspec.xml
+14 -7
View File
@@ -11,7 +11,7 @@
<Summary>Provides APIs for Wayland</Summary> <Summary>Provides APIs for Wayland</Summary>
<Description>Provides APIs for Wayland</Description> <Description>Provides APIs for Wayland</Description>
<License>LGPLv2.1-linking-exception</License> <License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="dcaac92b52d681c9d13330e78fcd745005269fdc" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwayland-everywhere-opensource-src-5.15.9.tar.xz</Archive> <Archive sha1sum="e8eda2be152407328226250af0157260d7583458" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>libX11-devel</Dependency> <Dependency>libX11-devel</Dependency>
@@ -28,8 +28,8 @@
<Dependency versionFrom="13.0.4">mesa-devel</Dependency> <Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency versionFrom="2.50.2">glib2-devel</Dependency> <Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="2.7.1">freetype-devel</Dependency> <Dependency versionFrom="2.7.1">freetype-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">qt_kde.patch</Patch> <Patch level="1">qt_kde.patch</Patch>
@@ -51,8 +51,8 @@
<Dependency versionFrom="13.0.4">mesa</Dependency> <Dependency versionFrom="13.0.4">mesa</Dependency>
<Dependency versionFrom="2.50.2">glib2</Dependency> <Dependency versionFrom="2.50.2">glib2</Dependency>
<Dependency versionFrom="2.7.1">freetype</Dependency> <Dependency versionFrom="2.7.1">freetype</Dependency>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency versionFrom="5.15.9">qt5-declarative</Dependency> <Dependency versionFrom="5.15.10">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
@@ -66,7 +66,7 @@
<Name>qt5-wayland-devel</Name> <Name>qt5-wayland-devel</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">qt5-wayland</Dependency> <Dependency release="current">qt5-wayland</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/pkgconfig</Path> <Path fileType="library">/usr/lib/pkgconfig</Path>
@@ -77,7 +77,7 @@
<Package> <Package>
<Name>qt5-wayland-docs</Name> <Name>qt5-wayland-docs</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency> <Dependency versionFrom="5.15.10">qt5-base</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
@@ -85,6 +85,13 @@
</Package> </Package>
<History> <History>
<Update release="34">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="33"> <Update release="33">
<Date>2023-04-10</Date> <Date>2023-04-10</Date>
<Version>5.15.9</Version> <Version>5.15.9</Version>