>From 5cfb8892139cd29bf73fe92bcf9908f85f308d4a Mon Sep 17 00:00:00 2001 From: Steve Markgraf <[email protected]> Date: Tue, 18 May 2010 00:20:16 +0200 Subject: [PATCH] gui: fix compile on ubuntu lucid amd64
Signed-off-by: Steve Markgraf <[email protected]> --- gui/mainwindow.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index f88f10c..b32aa6a 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -265,7 +265,8 @@ void MainWindow::on_actionScan_triggered() for (int i = 0; samplerates->list[i]; ++i) { /* TODO: Free return value of sigrok_samplerate_string(). */ s = QString(sigrok_samplerate_string(samplerates->list[i])); - ui->comboBoxSampleRate->addItem(s, samplerates->list[i]); + ui->comboBoxSampleRate->addItem(s, + QVariant::fromValue(samplerates->list[i])); } /* FIXME */ @@ -333,7 +334,7 @@ void MainWindow::on_action_Open_triggered() ui->comboBoxNumSamples->clear(); ui->comboBoxNumSamples->addItem(QString::number(getNumSamples()), - getNumSamples()); + QVariant::fromValue(getNumSamples())); ui->comboBoxNumSamples->setEnabled(true); ui->labelSampleStart->setText(tr("Start sample: ")); -- 1.7.0.4
------------------------------------------------------------------------------
_______________________________________________ sigrok-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/sigrok-devel
