Mercurial > hg > svgui

diff layer/TimeValueLayer.cpp @ 640:c6d705bf1672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9d8f6552014d d632a1e87018
children 62330d542e1d
line wrap: on
line diff
--- a/layer/TimeValueLayer.cpp	Tue Apr 16 15:17:33 2013 +0100
+++ b/layer/TimeValueLayer.cpp	Tue May 14 12:36:43 2013 +0100
@@ -1840,7 +1840,7 @@
 
             if (generation == Labeller::ValueFromCyclicalCounter ||
                 generation == Labeller::ValueFromTwoLevelCounter) {
-                int cycleSize = QInputDialog::getInteger
+                int cycleSize = QInputDialog::getInt
                     (0, tr("Select cycle size"),
                      tr("Cycle size:"), 4, 2, 16, 1);
                 labeller.setCounterCycleSize(cycleSize);