diff options
Diffstat (limited to 'lxqt-base/lxqt-config/files')
-rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch | 21 | ||||
-rw-r--r-- | lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch | 64 |
2 files changed, 0 insertions, 85 deletions
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch deleted file mode 100644 index 31b22cd6..00000000 --- a/lxqt-base/lxqt-config/files/lxqt-config-0.14.1-qt-5.14-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cd7de12f2ebe5a2ad03c2086da4c3b5317a4506e Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <yan12125@gmail.com> -Date: Sun, 15 Dec 2019 09:32:55 +0800 -Subject: [PATCH] Fix building with Qt 5.14 - ---- - lxqt-config-input/touchpaddevice.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lxqt-config-input/touchpaddevice.cpp b/lxqt-config-input/touchpaddevice.cpp -index 31adbe5f..41690c2c 100644 ---- a/lxqt-config-input/touchpaddevice.cpp -+++ b/lxqt-config-input/touchpaddevice.cpp -@@ -21,6 +21,7 @@ - #include <cmath> - #include <QDebug> - #include <QX11Info> -+#include <QUrl> - #include <libudev.h> - #include <LXQt/Settings> - #include <X11/Xatom.h> diff --git a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch deleted file mode 100644 index ddfd7801..00000000 --- a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp ---- a/lxqt-config-appearance/main.cpp 2019-02-24 00:16:01.000000000 +0000 -+++ b/lxqt-config-appearance/main.cpp 2019-05-22 11:13:45.456936737 +0100 -@@ -30,10 +30,7 @@ - #include <LXQt/Settings> - #include <LXQt/ConfigDialog> - #include <QCommandLineParser> --#include "iconthemeconfig.h" - #include "lxqtthemeconfig.h" --#include "styleconfig.h" --#include "fontsconfig.h" - #include "configothertoolkits.h" - - #include "../liblxqt-config-cursor/selectwnd.h" -@@ -66,23 +63,6 @@ - - QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5. - -- /*** Widget Style ***/ -- StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, &mConfigAppearanceSettings, configOtherToolKits, dialog); -- dialog->addPage(stylePage, QObject::tr("Widget Style"), QStringList() << "preferences-desktop-theme" << "preferences-desktop"); -- QObject::connect(dialog, &LXQt::ConfigDialog::reset, stylePage, &StyleConfig::initControls); -- QObject::connect(stylePage, &StyleConfig::settingsChanged, dialog, [dialog] { -- dialog->enableButton(QDialogButtonBox::Apply, true); // enable Apply button when something is changed -- }); -- -- /*** Icon Theme ***/ -- IconThemeConfig* iconPage = new IconThemeConfig(settings, dialog); -- dialog->addPage(iconPage, QObject::tr("Icons Theme"), QStringList() << "preferences-desktop-icons" << "preferences-desktop"); -- QObject::connect(dialog, &LXQt::ConfigDialog::reset, iconPage, &IconThemeConfig::initControls); -- QObject::connect(iconPage, &IconThemeConfig::settingsChanged, dialog, [dialog] { -- dialog->enableButton(QDialogButtonBox::Apply, true); -- }); -- QObject::connect(iconPage, &IconThemeConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); -- - /*** LXQt Theme ***/ - LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog); - dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << "preferences-desktop-color" << "preferences-desktop"); -@@ -91,14 +71,6 @@ - dialog->enableButton(QDialogButtonBox::Apply, true); - }); - -- /*** Font ***/ -- FontsConfig* fontsPage = new FontsConfig(settings, &qtSettings, dialog); -- dialog->addPage(fontsPage, QObject::tr("Font"), QStringList() << "preferences-desktop-font" << "preferences-desktop"); -- QObject::connect(dialog, &LXQt::ConfigDialog::reset, fontsPage, &FontsConfig::initControls); -- QObject::connect(fontsPage, &FontsConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); -- QObject::connect(fontsPage, &FontsConfig::settingsChanged, dialog, [dialog] { -- dialog->enableButton(QDialogButtonBox::Apply, true); -- }); - - /*** Cursor Theme ***/ - SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog); -@@ -112,10 +84,7 @@ - QObject::connect(dialog, &LXQt::ConfigDialog::clicked, [=] (QDialogButtonBox::StandardButton btn) { - if (btn == QDialogButtonBox::Apply) - { -- stylePage->applyStyle(); -- iconPage->applyIconTheme(); - themePage->applyLxqtTheme(); -- fontsPage->updateQtFont(); - cursorPage->applyCusorTheme(); - // disable Apply button after changes are applied - dialog->enableButton(btn, false); |