From 915276748ca341c5a153233b9d59189f7e141408 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 08:09:33 +0200 Subject: [PATCH] Replace deprecated function qt_mac_set_dock_menu() by method QMenu::setAsDockMenu(). --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 4 +++- src/app/valentina/mainwindow.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 91c19b1a6..bf7fbc8aa 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -138,12 +138,14 @@ TMainWindow::TMainWindow(QWidget *parent) ui->pushButtonShowInExplorer->setText(tr("Show in Finder")); -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 2) // Mac OS Dock Menu QMenu *menu = new QMenu(this); connect(menu, &QMenu::aboutToShow, this, &TMainWindow::AboutToShowDockMenu); AboutToShowDockMenu(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + menu->setAsDockMenu(); +#else extern void qt_mac_set_dock_menu(QMenu *); qt_mac_set_dock_menu(menu); #endif diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 2e8ba9a24..1002c0065 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -204,7 +204,6 @@ MainWindow::MainWindow(QWidget *parent) setUnifiedTitleAndToolBarOnMac(true); -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 2) // Mac OS Dock Menu QMenu *menu = new QMenu(this); @@ -224,6 +223,9 @@ MainWindow::MainWindow(QWidget *parent) actionPreferences->setMenuRole(QAction::NoRole); connect(actionPreferences, &QAction::triggered, this, &MainWindow::Preferences); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + menu->setAsDockMenu(); +#else extern void qt_mac_set_dock_menu(QMenu *); qt_mac_set_dock_menu(menu); #endif