X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=be418df29cc24ddac4ab050855ab168dbb30f59e;hp=3af93f1476f2433a5b593b865fa1f15647a69e96;hb=009fc9ae42ecccd3802f549b39c19a2ba895959d;hpb=926934b87183a33306c030ed0a01dfea630fa36d

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 3af93f14..be418df2 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -99,6 +99,7 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	serial_config_layout->addWidget(&serial_devices_);
 	serial_config_layout->addWidget(&serial_baudrate_);
 	serial_config_layout->addWidget(new QLabel("baud"));
+	serial_config_->setEnabled(false);
 
 	tcp_config_ = new QWidget();
 	QHBoxLayout *tcp_config_layout = new QHBoxLayout(tcp_config_);
@@ -187,7 +188,7 @@ void Connect::populate_drivers()
 		if (supported_device)
 			drivers_.addItem(QString("%1 (%2)").arg(
 				driver->long_name().c_str(), name.c_str()),
-				qVariantFromValue(driver));
+				QVariant::fromValue(driver));
 	}
 }
 
@@ -210,6 +211,7 @@ void Connect::serial_toggled(bool checked)
 {
 	serial_devices_.setEnabled(checked);
 	serial_baudrate_.setEnabled(checked);
+	serial_config_->setEnabled(checked);
 }
 
 void Connect::tcp_toggled(bool checked)
@@ -274,7 +276,7 @@ void Connect::scan_pressed()
 		text += QString(" with %1 channels").arg(device->device()->channels().size());
 
 		QListWidgetItem *const item = new QListWidgetItem(text, &device_list_);
-		item->setData(Qt::UserRole, qVariantFromValue(device));
+		item->setData(Qt::UserRole, QVariant::fromValue(device));
 		device_list_.addItem(item);
 	}