X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=c56b03cd91a18e7a52dd5ef4786afa8363fa275f;hb=99678e189313b168c410fa15cd10cb673b73c8a2;hp=54558b50e7201a8da4f7fe4462d521efed9945c1;hpb=ce26c3770b254362c7bd1e094ba8f8bf22133653;p=quassel.git diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp index 54558b50..c56b03cd 100644 --- a/src/uisupport/multilineedit.cpp +++ b/src/uisupport/multilineedit.cpp @@ -301,7 +301,7 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) if (event == QKeySequence::InsertLineSeparator) { #else -# ifdef Q_WS_MAC +# ifdef Q_OS_MAC if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && event->modifiers() & Qt::META) { # else if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && event->modifiers() & Qt::SHIFT) { @@ -726,7 +726,7 @@ void MultiLineEdit::on_textChanged() msg += "...

"; QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No); question.setDefaultButton(QMessageBox::No); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC question.setWindowFlags(question.windowFlags() | Qt::Sheet); #endif if (question.exec() != QMessageBox::Yes)