Compare commits

..

No commits in common. "ad5048d5b1ff225dab28c8909db5bc30136e988d" and "f6e701985518c3c1d78fb9fc5aa923c85887e749" have entirely different histories.

4 changed files with 18 additions and 133 deletions

Binary file not shown.

View File

@ -1,68 +0,0 @@
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,6 +1,3 @@
# 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
@ -10,62 +7,40 @@
%endif %endif
Name: dde-qt5integration Name: dde-qt5integration
Version: 5.5.25 Version: 5.0.16
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: %{name}-%{version}.tar.gz Source0: %{repo}_%{version}.orig.tar.xz
BuildRequires: gcc-c++ BuildRequires: qt5-qtbase-devel
BuildRequires: pkgconfig(atk)
BuildRequires: dtkcore-devel
BuildRequires: dtkwidget-devel
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: gdk-pixbuf-xlib
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-static
BuildRequires: qt5-qtbase-private-devel BuildRequires: dtkwidget-devel
BuildRequires: make BuildRequires: pkg-config
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: mtdev-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: libqtxdg libqtxdg-devel
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
%autosetup -n %{repo}-%{version} -p1 %setup -q -n %{repo}-%{version}
%build %build
%qmake_qt5 PREFIX=%{_prefix} BASED_DTK_DIR=based-dtk mkdir build && cd build
%make_build %{_libdir}/qt5/bin/qmake ..
%{__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
@ -73,32 +48,10 @@ Qt platform theme integration plugins for DDE
%{_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.