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

src/tag/addtagdialog.cpp

@@ -63,8 +63,8 @@ AddTagDialog::AddTagDialog(const QList<KActionCollection *> &actions, QWidget *p
     connect(d->mTagWidget->tagNameLineEdit(), &KLineEdit::textChanged, this, &AddTagDialog::slotTagNameChanged);
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    d->mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     d->mOkButton = buttonBox->button(QDialogButtonBox::Ok);
+    d->mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &AddTagDialog::slotSave);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &AddTagDialog::reject);
     d->mOkButton->setDefault(true);