diff options
Diffstat (limited to 'dev-util/qdevicemonitor/files')
3 files changed, 91 insertions, 0 deletions
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch new file mode 100644 index 000000000000..e01dbf97ba2a --- /dev/null +++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch @@ -0,0 +1,27 @@ +From 079bc4cf3a59a98c429b1db21fcf3f88c19d2bb5 Mon Sep 17 00:00:00 2001 +From: Alexander Lopatin <alopatindev@gmail.com> +Date: Fri, 13 Jul 2018 18:37:42 +0300 +Subject: [PATCH] fix crash that happens after fresh installation + +Signed-off-by: Alexander Lopatin <alopatindev@gmail.com> +--- + qdevicemonitor/devices/DeviceFacade.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qdevicemonitor/devices/DeviceFacade.cpp b/qdevicemonitor/devices/DeviceFacade.cpp +index ced04b3..6df67eb 100644 +--- a/qdevicemonitor/devices/DeviceFacade.cpp ++++ b/qdevicemonitor/devices/DeviceFacade.cpp +@@ -151,8 +151,8 @@ void DeviceFacade::loadSettings(const QSettings& s) + if (darkTheme.isValid()) + { + m_darkTheme = darkTheme.toBool(); +- m_colorTheme = ColorTheme::create(m_darkTheme); + } ++ m_colorTheme = ColorTheme::create(m_darkTheme); + + const QVariant clearAndroidLog = s.value("clearAndroidLog"); + if (clearAndroidLog.isValid()) +-- +2.16.4 + diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch new file mode 100644 index 000000000000..fb3df7689d27 --- /dev/null +++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch @@ -0,0 +1,25 @@ +From 5da5c11ff84cc293b5db3a0d7ba09c62b3db94a8 Mon Sep 17 00:00:00 2001 +From: Alexander Lopatin <alopatindev@gmail.com> +Date: Fri, 13 Jul 2018 18:30:21 +0300 +Subject: [PATCH] fix Qt 5.11 specific issue https://bugs.gentoo.org/660932 + +Signed-off-by: Alexander Lopatin <alopatindev@gmail.com> +--- + qdevicemonitor/ui/MainWindow.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp +index c1bf263..fc22b4d 100644 +--- a/qdevicemonitor/ui/MainWindow.cpp ++++ b/qdevicemonitor/ui/MainWindow.cpp +@@ -31,6 +31,7 @@ + #include <QProcess> + #include <QSettings> + #include <QStringList> ++#include <QTabBar> + #include <QtCore/QStringBuilder> + + #if defined(Q_OS_WIN32) +-- +2.16.4 + diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch new file mode 100644 index 000000000000..9b9b46320fe7 --- /dev/null +++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch @@ -0,0 +1,39 @@ +From 08985f03236a70b35b03b2749cabbd45398e968b Mon Sep 17 00:00:00 2001 +From: Alexander Lopatin <alopatindev@gmail.com> +Date: Thu, 16 Jan 2020 11:26:38 +0300 +Subject: [PATCH] Fix "error: const QRect QDesktopWidget::screenGeometry(int) + const is deprecated: Use QGuiApplication::screens() + [-Werror=deprecated-declarations]" https://bugs.gentoo.org/705438 + +Signed-off-by: Alexander Lopatin <alopatindev@gmail.com> +--- + qdevicemonitor/ui/MainWindow.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp +index 4266de6..69d4433 100644 +--- a/qdevicemonitor/ui/MainWindow.cpp ++++ b/qdevicemonitor/ui/MainWindow.cpp +@@ -29,6 +29,7 @@ + #include <QFileInfo> + #include <QMessageBox> + #include <QProcess> ++#include <QScreen> + #include <QSettings> + #include <QStringList> + #include <QTabBar> +@@ -181,9 +182,9 @@ void MainWindow::loadSettings() + { + setGeometry(geom.toRect()); + } +- else ++ else if (!qApp->screens().isEmpty()) + { +- QRect geom = qApp->desktop()->screenGeometry(); ++ QRect geom = qApp->screens()[0]->availableVirtualGeometry(); + const int screenWidth = geom.width(); + const int screenHeight = geom.height(); + geom.setWidth(int(screenWidth * 0.7f)); +-- +2.21.0 + |