openkylin
/
qt5-ukui-platformtheme
mirror of https://gitee.com/openkylin/qt5-ukui-platformtheme.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Remove Qt5Xdg

This commit is contained in:
谭静 2024-11-21 15:45:48 +08:00
parent 2ed5294961
commit 4553f8da17
5 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -19,7 +19,6 @@ Build-Depends: dbus-x11,
libpeony-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libqt5xdgiconloader-dev,
peony,
pkg-config,
pkg-kde-tools,
@ -42,7 +41,6 @@ Vcs-Browser: https://gitee.com/openkylin/qt5-ukui-platformtheme
Package: qt5-ukui-platformtheme
Architecture: any
Depends: libqt5-ukui-style1 (= ${binary:Version}),
libqt5xdgiconloader3,
qml-module-org-ukui-qqc2desktopstyle (= ${binary:Version}),
qml-module-org-ukui-stylehelper (= ${binary:Version}),
qt5-styles-ukui (= ${binary:Version}),

1
qt5-ukui-platformtheme/CMakeLists.txt
View File

@ -65,7 +65,6 @@ find_package(X11)
find_package(PkgConfig)
pkg_check_modules(QGSETTINGS REQUIRED gsettings-qt)
pkg_check_modules(REQUIRED Qt5XdgIconLoader)
pkg_check_modules(REQUIRED kysdk-waylandhelper)
pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
pkg_check_modules(FREETYPE2 REQUIRED freetype2)

10
ukui-qml-style-helper/CMakeLists.txt
View File

@ -27,16 +27,6 @@ pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0 )
set(EXTERNAL_LIBS "")
set(PC_PKGS Qt5Xdg)
foreach(PC_LIB IN ITEMS ${PC_PKGS})
pkg_check_modules(${PC_LIB} REQUIRED IMPORTED_TARGET ${PC_LIB})
if(${${PC_LIB}_FOUND})
include_directories(${${PC_LIB}_INCLUDE_DIRS})
link_directories(${${PC_LIB}_LIBRARY_DIRS})
list(APPEND EXTERNAL_LIBS PkgConfig::${PC_LIB})
endif()
endforeach()
include_directories(${GLIB2_INCLUDE_DIRS})
include_directories(${Qsettings_INCLUDE_DIRS})

19
ukui-qml-style-helper/styleparameter/imageprovider.cpp
View File

@ -6,7 +6,6 @@
#include <QApplication>
#include <QPalette>
#include <QSize>
#include <qt5xdg/XdgIcon>
#include <QColor>
#include <QPainter>
#include <qmath.h>
@ -43,13 +42,7 @@ QIcon IconHelper::loadIcon(const QString &id)
icon.addPixmap(pixmap);
}
} else {
isOk = loadThemeIcon(id, icon);
if (!isOk) {
isOk = loadXdgIcon(id, icon);
}
}
if (!isOk) {
loadDefaultIcon(icon);
}
@ -87,16 +80,6 @@ void IconHelper::loadDefaultIcon(QIcon &icon)
}
}
bool IconHelper::loadXdgIcon(const QString &name, QIcon &icon)
{
icon = XdgIcon::fromTheme(name);
if (icon.isNull()) {
qWarning() << "Error: loadXdgIcon, icon dose not exists. name:" << name;
return false;
}
return true;
}
// see: https://doc.qt.io/archives/qt-5.12/qurl.html#details
QString IconHelper::toLocalPath(const QUrl &url)
{
@ -139,7 +122,7 @@ bool IconHelper::isRemoteServerFile(const QUrl &url)
bool IconHelper::isThemeIcon(const QString &name)
{
return QIcon::hasThemeIcon(name) || !XdgIcon::fromTheme(name).isNull();
return QIcon::hasThemeIcon(name);
}
bool IconHelper::isLocalFile(const QUrl &url)

1
ukui-qml-style-helper/styleparameter/imageprovider.h
View File

@ -68,7 +68,6 @@ public:
private:
static bool loadThemeIcon(const QString &name, QIcon &icon);
static bool loadXdgIcon(const QString &name, QIcon &icon);
static void loadDefaultIcon(QIcon &icon);
static QPixmap generatedDisablePixmap(QPixmap pixmap);
static QPixmap generatedHightlightPixmap(QPixmap pixmap);