From ca88c6ab58603902b3239149b8e8f2d234d80ce4 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 4 May 2020 15:06:43 +0200 Subject: QFileDialog: fix enumeration mismatch To define a shortcut a Qt::ArrowType enum value was getting mixed with a keyboard modifier. An actual mistake spotted by blocking mixed-enum operations! Change-Id: I4df56ee411599937c243288e8518b5c1df446397 Pick-To: 5.15 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/dialogs/qfiledialog.cpp') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 5b890e0f8d..77fec76c6f 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3346,7 +3346,7 @@ void QFileDialogPrivate::createMenuActions() QAction *goToParent = new QAction(q); goToParent->setObjectName(QLatin1String("qt_goto_parent_action")); #ifndef QT_NO_SHORTCUT - goToParent->setShortcut(Qt::CTRL + Qt::UpArrow); + goToParent->setShortcut(Qt::CTRL | Qt::Key_Up); #endif QObject::connect(goToParent, SIGNAL(triggered()), q, SLOT(_q_navigateToParent())); q->addAction(goToParent); -- cgit v1.2.3