Fix build on Qt less than 5.6.
This commit is contained in:
parent
fcc221f53a
commit
a05a66b2ae
|
@ -1066,7 +1066,11 @@ void VPMainWindow::CreateWindowMenu(QMenu *menu)
|
||||||
window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
|
window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||||
|
QAction *action = menu->addAction(title, this, SLOT(ShowWindow()));
|
||||||
|
#else
|
||||||
QAction *action = menu->addAction(title, this, &VPMainWindow::ShowWindow);
|
QAction *action = menu->addAction(title, this, &VPMainWindow::ShowWindow);
|
||||||
|
#endif //QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||||
action->setData(i);
|
action->setData(i);
|
||||||
action->setCheckable(true);
|
action->setCheckable(true);
|
||||||
action->setMenuRole(QAction::NoRole);
|
action->setMenuRole(QAction::NoRole);
|
||||||
|
|
|
@ -3614,7 +3614,11 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
|
||||||
window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
|
window->isWindowModified() ? title.replace(index, 3, QChar('*')) : title.replace(index, 3, QString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||||
|
QAction *action = menu->addAction(title, this, SLOT(ShowWindow()));
|
||||||
|
#else
|
||||||
QAction *action = menu->addAction(title, this, &TMainWindow::ShowWindow);
|
QAction *action = menu->addAction(title, this, &TMainWindow::ShowWindow);
|
||||||
|
#endif //QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||||
action->setData(i);
|
action->setData(i);
|
||||||
action->setCheckable(true);
|
action->setCheckable(true);
|
||||||
action->setMenuRole(QAction::NoRole);
|
action->setMenuRole(QAction::NoRole);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user