dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make MainWindow::nativeEvent compatible with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-18 04:15:42 +02:00
parent a101252701
commit 1f0961d574
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mainwindow.cpp
View File

@@ -2537,7 +2537,11 @@ void MainWindow::Raise() {
activateWindow(); activateWindow();
} }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result) {
#else
bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result) { bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result) {
#endif
Q_UNUSED(eventType); Q_UNUSED(eventType);
Q_UNUSED(result); Q_UNUSED(result);

4
src/core/mainwindow.h
View File

@@ -112,7 +112,11 @@ class MainWindow : public QMainWindow, public PlatformInterface {
protected: protected:
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
#else
bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
#endif
// PlatformInterface // PlatformInterface
void Activate() override; void Activate() override;