mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-23 18:14:51 +08:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 1c4a8ddd6f8e896787c837d37e9ad596c973e436 Mon Sep 17 00:00:00 2001
|
|
From: David Rosca <nowrep@gmail.com>
|
|
Date: Wed, 23 Jan 2019 15:55:29 +0100
|
|
Subject: PyFalkon: Fix build with PySide 5.12
|
|
|
|
BUG: 402947
|
|
FIXED-IN: 3.1.0
|
|
---
|
|
src/lib/tools/desktopfile.h | 2 +-
|
|
src/plugins/PyFalkon/pyfalkon_global.h | 3 ---
|
|
2 files changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/src/lib/tools/desktopfile.h b/src/lib/tools/desktopfile.h
|
|
index baf231a..d41e7e2 100644
|
|
--- a/src/lib/tools/desktopfile.h
|
|
+++ b/src/lib/tools/desktopfile.h
|
|
@@ -26,7 +26,7 @@ class QSettings;
|
|
class FALKON_EXPORT DesktopFile
|
|
{
|
|
public:
|
|
- explicit DesktopFile();
|
|
+ DesktopFile();
|
|
explicit DesktopFile(const QString &filePath);
|
|
|
|
QString name() const;
|
|
diff --git a/src/plugins/PyFalkon/pyfalkon_global.h b/src/plugins/PyFalkon/pyfalkon_global.h
|
|
index b064dce..391ef6c 100644
|
|
--- a/src/plugins/PyFalkon/pyfalkon_global.h
|
|
+++ b/src/plugins/PyFalkon/pyfalkon_global.h
|
|
@@ -16,9 +16,6 @@
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
* ============================================================ */
|
|
|
|
-// Make "signals:", "slots:" visible as access specifiers
|
|
-#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
|
|
-
|
|
// PYSIDE-711
|
|
#include <QHstsPolicy>
|
|
#include <QWebEngineContextMenuData>
|
|
--
|
|
cgit v1.1
|
|
|