Commit a767da6f2d0fbee707f5c2fe896fa501b3da6b07

Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)

Merge-request: 2300
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
src/gui/widgets/qdatetimeedit.cpp
(1 / 1)
  
11751175 return; }
11761176 }
11771177 QAbstractSpinBox::keyPressEvent(event);
1178 if (select && !(event->modifiers() & Qt::ShiftModifier) && !d->edit->hasSelectedText()) {
1178 if (select && !d->edit->hasSelectedText()) {
11791179 if (inserted && d->sectionAt(d->edit->cursorPosition()) == QDateTimeParser::NoSectionIndex) {
11801180 QString str = d->displayText();
11811181 int pos = d->edit->cursorPosition();
tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
(2 / 0)
  
33573357 QTest::addColumn<Qt::KeyboardModifiers>("modifiers");
33583358 QTest::newRow("None") << (Qt::KeyboardModifiers)Qt::NoModifier;
33593359 QTest::newRow("Keypad") << (Qt::KeyboardModifiers)Qt::KeypadModifier;
3360 // QTBUG-7842: Using KeyPad with shift (numlock off)
3361 QTest::newRow("Keypad+Shift") << (Qt::KeyboardModifiers)(Qt::KeypadModifier|Qt::ShiftModifier);
33603362}
33613363
33623364