tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing QQuickStyle::setStyle calls

Browse source 
Calls `QQuickStyle::setStyle("breeze")` everywhere we were
calling `QApplication::setStyle("org.kde.desktop")`.
This commit is contained in:
Albert Vaca Cintora 2024-10-18 11:38:57 +00:00
parent 10368df021
commit 475a4c2ca8
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcm/CMakeLists.txt
View file

@ -11,6 +11,7 @@ target_link_libraries(kcm_kdeconnect
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::QuickWidgets Qt::QuickWidgets
Qt::QuickControls2
KF6::I18n KF6::I18n
KF6::KCMUtils KF6::KCMUtils
kdeconnectinterfaces kdeconnectinterfaces

6
kcm/kcm.cpp
View file

@ -16,6 +16,7 @@
#include <QQmlContext> #include <QQmlContext>
#include <QQuickItem> #include <QQuickItem>
#include <QQuickStyle>
#include "dbushelpers.h" #include "dbushelpers.h"
#include "dbusinterfaces.h" #include "dbusinterfaces.h"
@ -51,6 +52,11 @@ KdeConnectKcm::KdeConnectKcm(QObject *parent, const KPluginMetaData &md, const Q
QApplication::setStyle(QStringLiteral("breeze")); QApplication::setStyle(QStringLiteral("breeze"));
#endif #endif
// Default to org.kde.desktop style unless the user forces another style
if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
}
kcmUi.setupUi(widget()); kcmUi.setupUi(widget());
sortProxyModel = new DevicesSortProxyModel(devicesModel); sortProxyModel = new DevicesSortProxyModel(devicesModel);

1
urlhandler/CMakeLists.txt
View file

@ -12,6 +12,7 @@ target_link_libraries(kdeconnect-handler
kdeconnectcore kdeconnectcore
kdeconnectversion kdeconnectversion
Qt::Widgets Qt::Widgets
Qt::QuickControls2
KF6::CoreAddons KF6::CoreAddons
KF6::ConfigWidgets KF6::ConfigWidgets
KF6::DBusAddons KF6::DBusAddons

6
urlhandler/kdeconnect-handler.cpp
View file

@ -12,6 +12,7 @@
#include <QDialog> #include <QDialog>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QQuickStyle>
#include <QTextStream> #include <QTextStream>
#include <QUrl> #include <QUrl>
@ -59,6 +60,11 @@ int main(int argc, char **argv)
QApplication::setStyle(QStringLiteral("breeze")); QApplication::setStyle(QStringLiteral("breeze"));
#endif #endif
// Default to org.kde.desktop style unless the user forces another style
if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
}
QUrl urlToShare; QUrl urlToShare;
bool open; bool open;
QString deviceId; QString deviceId;