feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
This commit is contained in:
Tim Jenssen
2022-10-25 19:01:00 +02:00
parent 13f40f5471 0944bfb7f0
commit aa33927651
186 changed files with 2027 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/docker/dockerdevice.cpp
View File

@@ -539,6 +539,9 @@ bool isValidMountInfo(const DockerDevicePrivate::TemporaryMountInfo &mi)
if (!mi.path.isAbsolutePath() || !mi.containerPath.isAbsolutePath())
return false;
if (mi.containerPath.isRootPath())
return false;
if (!mi.path.exists())
return false;

4
src/plugins/docker/dockerdevicewidget.cpp
View File

@@ -65,9 +65,9 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
DockerApi::recheckDockerDaemon();
});
m_keepEntryPoint = new QCheckBox(Tr::tr("Don't modify entry point"));
m_keepEntryPoint = new QCheckBox(Tr::tr("Do not modify entry point"));
m_keepEntryPoint->setToolTip(
Tr::tr("If checked, the entry point of the image will not be modified. Only use this if "
Tr::tr("Prevents modifying the entry point of the image. Enable only if "
"the image starts into a shell."));
m_keepEntryPoint->setChecked(m_data.keepEntryPoint);
m_keepEntryPoint->setEnabled(true);