HomePhabricator
Diffusion MITK 7836da9ac4ff

Merge remote-tracking branch 'origin/T25171-Hotkeys-preference-page-crash' into…
7836da9ac4ff
Actions

Description

Merge remote-tracking branch 'origin/T25171-Hotkeys-preference-page-crash' into T25056-Master-integration

Details

Provenance
kalaliAuthored on Nov 29 2018, 4:51 PM
kalaliPushed on Nov 29 2018, 4:56 PM
Parents
rMITK8de786a10547: Merge branch 'T25694-Enable-data-manager-hotkeys' into T25056-Master-integration
rMITKc06588fd30a4: Change the way QKeySequence is initialized to correctly capture key-modifiers.
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (6)

PathSizePackages
Modules/
QtWidgetsExt/
include/
O3: MITK Reviewer Group II
src/
O3: MITK Reviewer Group II
Plugins/
org.mitk.gui.qt.datamanager/
src/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I

rMITK7836da9ac4ff

View Options

Modules/QtWidgetsExt/include/QmitkHotkeyLineEdit.h

Loading...
View Options

Modules/QtWidgetsExt/src/QmitkHotkeyLineEdit.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h

Loading...
View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.h

Loading...
MITK · MIC · IMSY · DKFZ