Mercurial > hg > svgui
comparison widgets/AudioDial.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 |
---|---|
508 setMappedValue(newValue); | 508 setMappedValue(newValue); |
509 } | 509 } |
510 | 510 |
511 } else { | 511 } else { |
512 | 512 |
513 int newPosition = QInputDialog::getInteger | 513 int newPosition = QInputDialog::getInt |
514 (this, | 514 (this, |
515 tr("Enter new value"), | 515 tr("Enter new value"), |
516 tr("Enter a new value from %1 to %2:") | 516 tr("Enter a new value from %1 to %2:") |
517 .arg(minimum()).arg(maximum()), | 517 .arg(minimum()).arg(maximum()), |
518 value(), minimum(), maximum(), singleStep(), &ok); | 518 value(), minimum(), maximum(), singleStep(), &ok); |