Merge branch 'ui-refactor' into menu2

Brad Davis committed 11 years ago

Commit 198224c2 parents a96f69a 0afe8c013 files · +47 −48Browse files

Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all

Unified · Split

interface/src/Application.cpp+0−1

@@ -1088,7 +1088,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1087 unmodified lines
1088	bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);	1088	bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
1089	bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);	1089	bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);
1090	bool isOption = event->modifiers().testFlag(Qt::AltModifier);	1090	bool isOption = event->modifiers().testFlag(Qt::AltModifier);
1091	bool isKeypad = event->modifiers().testFlag(Qt::KeypadModifier);
1092	switch (event->key()) {	1091	switch (event->key()) {
1093	break;	1092	break;
1094	case Qt::Key_Enter:	1093	case Qt::Key_Enter: