comparison widgets/Thumbwheel.cpp @ 640:c6d705bf1672

Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:43 +0100
parents d632a1e87018
children 1a0dfcbffaf1
comparison
equal deleted inserted replaced
632:9d8f6552014d 640:c6d705bf1672
371 setMappedValue(newValue); 371 setMappedValue(newValue);
372 } 372 }
373 373
374 } else { 374 } else {
375 375
376 int newValue = QInputDialog::getInteger 376 int newValue = QInputDialog::getInt
377 (this, 377 (this,
378 tr("Enter new value"), 378 tr("Enter new value"),
379 tr("Enter a new value from %1 to %2:") 379 tr("Enter a new value from %1 to %2:")
380 .arg(m_min).arg(m_max), 380 .arg(m_min).arg(m_max),
381 getValue(), m_min, m_max, 1, &ok); 381 getValue(), m_min, m_max, 1, &ok);