forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/10.0'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp src/tools/perfparser Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
This commit is contained in:
@@ -265,6 +265,7 @@ void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
|
||||
timeoutEditingFinished();
|
||||
sourceProfileCheckingChanged(m_sourceProfileCheckBox->isChecked());
|
||||
linkDeviceChanged(m_linkDeviceComboBox->currentIndex());
|
||||
qmlRuntimeEditingFinished();
|
||||
}
|
||||
|
||||
void GenericLinuxDeviceConfigurationWidget::updatePortsWarningLabel()
|
||||
|
||||
Reference in New Issue
Block a user