Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ad5048d5b1
!15 sync by openEuler-22.03-LTS-SP3
From: @Venland 
Reviewed-by: @xzyangha 
Signed-off-by: @xzyangha
2024-06-19 06:46:52 +00:00
liweigang
3436c3b1d5 update qt5integration package
Signed-off-by: liweigang <liweiganga@uniontech.com>
2024-06-18 17:23:39 +08:00
openeuler-ci-bot
d641cee745
!10 [sync] PR-9: update to 5.1.19
From: @openeuler-sync-bot 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
2023-05-08 03:23:25 +00:00
liweiganga
a632173374 update: update to 5.1.19
(cherry picked from commit ad068bf325f58068b5163368216b19e937d80f67)
2023-05-08 11:01:58 +08:00
openeuler-ci-bot
dacc15f509
!8 update to 5.1.12.3
From: @ll3366 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2022-02-25 06:46:59 +00:00
liweiganga
cb9e021695 update to 5.1.12.3 2022-02-25 14:09:41 +08:00
openeuler-ci-bot
bdd1a6ac95
!6 fix build error
From: @ll3366 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2022-02-11 09:05:27 +00:00
liweiganga
18651a466e fix buildRequires and build error 2022-02-11 16:37:02 +08:00
openeuler-ci-bot
e5a056f005 !3 Fixed BuildRequires
From: @weidongkl
Reviewed-by: @panchenbo
Signed-off-by: @panchenbo
2020-10-15 10:00:54 +08:00
weidong
62b044b918 Fixed BuildRequires 2020-10-15 09:56:38 +08:00
4 changed files with 133 additions and 18 deletions

Binary file not shown.

View File

@ -0,0 +1,68 @@
diff --color -Naur a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp
--- a/platformthemeplugin/qdeepintheme.cpp 2022-02-11 15:49:14.634625052 +0800
+++ b/platformthemeplugin/qdeepintheme.cpp 2022-02-11 16:29:14.918077063 +0800
@@ -29,6 +29,7 @@
#include <QDebug>
#include <QGuiApplication>
#include <QPainter>
+#include <QPainterPath>
#include <QPalette>
#include <QIconEnginePlugin>
@@ -612,10 +613,10 @@
}
QHighDpiScaling::updateHighDpiScaling();
- qDebug() << QHighDpiScaling::logicalDpi();
+ qDebug() << QHighDpiScaling::logicalDpi(nullptr);
updateScaleLogcailDpi(s->scaleLogicalDpi());
- qDebug() << QHighDpiScaling::logicalDpi();
+ qDebug() << QHighDpiScaling::logicalDpi(nullptr);
return true;
}
diff --color -Naur a/styleplugins/dstyleplugin/painterhelper.cpp b/styleplugins/dstyleplugin/painterhelper.cpp
--- a/styleplugins/dstyleplugin/painterhelper.cpp 2022-02-11 15:07:09.230398247 +0800
+++ b/styleplugins/dstyleplugin/painterhelper.cpp 2022-02-11 15:16:44.782154534 +0800
@@ -18,6 +18,7 @@
#include "painterhelper.h"
#include <QPainter>
+#include <QPainterPath>
#include <QDebug>
namespace dstyle {
diff --color -Naur a/styleplugins/dstyleplugin/pushbuttonhelper.cpp b/styleplugins/dstyleplugin/pushbuttonhelper.cpp
--- a/styleplugins/dstyleplugin/pushbuttonhelper.cpp 2022-02-11 15:07:09.226398214 +0800
+++ b/styleplugins/dstyleplugin/pushbuttonhelper.cpp 2022-02-11 15:08:41.515121700 +0800
@@ -29,6 +29,7 @@
#endif
#include <QDebug>
+#include <QPainterPath>
#include <QStyleOptionButton>
DWIDGET_USE_NAMESPACE
diff --color -Naur a/styleplugins/dstyleplugin/tabbarhelper.cpp b/styleplugins/dstyleplugin/tabbarhelper.cpp
--- a/styleplugins/dstyleplugin/tabbarhelper.cpp 2022-02-11 15:07:09.230398247 +0800
+++ b/styleplugins/dstyleplugin/tabbarhelper.cpp 2022-02-11 15:41:19.894749052 +0800
@@ -33,6 +33,7 @@
#include <QStyleOptionTabBarBase>
#include <QStyleOptionToolButton>
#include <QPainter>
+#include <QPainterPath>
#include <QToolButton>
#include <QLinearGradient>
#include <QDebug>
diff --color -Naur a/styleplugins/dstyleplugin/tabwidgethelper.cpp b/styleplugins/dstyleplugin/tabwidgethelper.cpp
--- a/styleplugins/dstyleplugin/tabwidgethelper.cpp 2022-02-11 15:07:09.230398247 +0800
+++ b/styleplugins/dstyleplugin/tabwidgethelper.cpp 2022-02-11 15:24:18.016384617 +0800
@@ -20,6 +20,7 @@
#include "painterhelper.h"
#include <QPainter>
+#include <QPainterPath>
#include <QTabWidget>
#include <QDebug>

View File

@ -1,3 +1,6 @@
# Run tests in check section
# disable for bootstrapping
%global repo qt5integration %global repo qt5integration
%bcond_with check %bcond_with check
%global with_debug 1 %global with_debug 1
@ -7,40 +10,62 @@
%endif %endif
Name: dde-qt5integration Name: dde-qt5integration
Version: 5.0.16 Version: 5.5.25
Release: 1 Release: 1
Summary: Qt platform theme integration plugins for DDE Summary: Qt platform theme integration plugins for DDE
License: GPLv3+ License: GPLv3+
Source0: %{repo}_%{version}.orig.tar.xz Source0: %{name}-%{version}.tar.gz
BuildRequires: qt5-qtbase-devel BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-static BuildRequires: pkgconfig(atk)
BuildRequires: dtkcore-devel
BuildRequires: dtkwidget-devel BuildRequires: dtkwidget-devel
BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig)
BuildRequires: qt5-qtx11extras-devel BuildRequires: pkgconfig(freetype2)
BuildRequires: qt5-qtsvg-devel BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: mtdev-devel BuildRequires: pkgconfig(glib-2.0)
BuildRequires: qt5-qtmultimedia-devel BuildRequires: gdk-pixbuf-xlib
BuildRequires: libqtxdg libqtxdg-devel BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libinput)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Xdg) >= 3.0.0
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(mtdev)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5MultimediaWidgets)
BuildRequires: qt5-qtbase-common
BuildRequires: gtest-devel
BuildRequires: gmock-devel
# for libQt5ThemeSupport.a
BuildRequires: qt5-qtbase-static
BuildRequires: qt5-qtbase-private-devel
BuildRequires: make
Requires: libqtxdg-devel
%description %description
Qt platform theme integration plugins for DDE Qt platform theme integration plugins for DDE
Multiple Qt plugins to provide better Qt5 integration for DDE is included. Multiple Qt plugins to provide better Qt5 integration for DDE is included.
%prep %prep
%setup -q -n %{repo}-%{version} %autosetup -n %{repo}-%{version} -p1
%build %build
mkdir build && cd build %qmake_qt5 PREFIX=%{_prefix} BASED_DTK_DIR=based-dtk
%{_libdir}/qt5/bin/qmake .. %make_build
%{__make}
cd -
%install %install
pushd %{_builddir}/%{repo}-%{version}/build
%make_install INSTALL_ROOT=%{buildroot} %make_install INSTALL_ROOT=%{buildroot}
popd
%files %files
%doc README.md %doc README.md
@ -48,10 +73,32 @@ popd
%{_libdir}/qt5/plugins/iconengines/libdsvgicon.so %{_libdir}/qt5/plugins/iconengines/libdsvgicon.so
%{_libdir}/qt5/plugins/imageformats/libdsvg.so %{_libdir}/qt5/plugins/imageformats/libdsvg.so
%{_libdir}/qt5/plugins/platformthemes/libqdeepin.so %{_libdir}/qt5/plugins/platformthemes/libqdeepin.so
%{_libdir}/qt5/plugins/styles/libdstyleplugin.so
%{_libdir}/qt5/plugins/iconengines/libdtkbuiltin.so %{_libdir}/qt5/plugins/iconengines/libdtkbuiltin.so
%{_libdir}/qt5/plugins/styles/libchameleon.so %{_libdir}/qt5/plugins/styles/libchameleon.so
# target
%{_qt5_plugindir}/platformthemes/based-dtk/libqdeepin.so
%{_qt5_plugindir}/iconengines/based-dtk/libdsvgicon.so
%{_qt5_plugindir}/imageformats/based-dtk/libdsvg.so
%{_qt5_plugindir}/iconengines/based-dtk/libdtkbuiltin.so
%{_qt5_plugindir}/styles/based-dtk/libchameleon.so
%{_libdir}/qt5/plugins/iconengines/based-dtk/libxdgicon.so
%{_libdir}/qt5/plugins/iconengines/libxdgicon.so
%changelog %changelog
* Tue Aug 01 2023 leeffo <liweiganga@uniontech.com> - 5.5.25-1
- upgrade to version 5.5.25
* Mon Apr 03 2023 liweiganga <liweiganga@uniontech.com> - 5.1.19-1
- update: update to 5.1.19
* Fri Feb 25 2022 liweigang <liweiganga@uniontech.com> - 5.1.12.3-1
- update to 5.1.12.3
* Fri Feb 11 2022 liweigang <liweiganga@uniontech.com> - 5.0.16-3
- fix buildRequires and build error
* Thu Oct 15 2020 weidong <weidong@uniontech.com> - 5.0.16-2
- Fixed BuildRequires
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.16-1 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.16-1
- Package init - Package init

Binary file not shown.