Commit 51200dc1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/19.04'

parents 4c474ea1 f89b54e9
......@@ -106,7 +106,7 @@ Dialog::Dialog(QWidget *parent)
page->enterPageNext();
//TODO ? necessary ???
Q_EMIT page->pageEnteredNext();
connect(button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &Dialog::accept);
connect(button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &Dialog::reject);
KHelpMenu *helpMenu = new KHelpMenu(this, KAboutData::applicationData(), true);
//Initialize menu
QMenu *menu = helpMenu->menu();
......@@ -215,7 +215,7 @@ void Dialog::clearDynamicPages()
void Dialog::reject()
{
connect(mSetupManager, &SetupManager::rollbackComplete, this, &Dialog::close);
connect(mSetupManager, &SetupManager::rollbackComplete, this, [this]() { KAssistantDialog::reject();} );
mSetupManager->requestRollback();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment