diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-04 15:06:43 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-05 00:31:57 +0000 |
| commit | ca88c6ab58603902b3239149b8e8f2d234d80ce4 (patch) | |
| tree | 94fbccf635cb988900c437ba3ea89f05e6d1339b /src/widgets/dialogs/qfiledialog.cpp | |
| parent | 2c9a29a09ad90b3707b9eab6aca7bffd3fc9413d (diff) | |
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 <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |