Open feat 031224

.github/workflows/build_linux.yml

@@ -10,7 +10,7 @@ on: [push]
 jobs:
   build:
     name: ${{ matrix.name }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
@@ -73,7 +73,7 @@ jobs:
 
   docs:
     name: Docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
 
     steps:

.github/workflows/build_windows.yml

@@ -22,7 +22,7 @@ env:
   # Versions
   QT_VERSION: 5.15.2
   QT_VS_VERSION: msvc2019_64
-  QT_VS_ADDIN_VERSION: 3.0.2
+  QT_VS_ADDIN_VERSION: 3.3.1
   ZLIB_VERSION: 1.3
   SUNDIALS_VERSION: 6.4.1
   HDF5_VERSION: 1.12.2
@@ -70,7 +70,7 @@ jobs:
       # Also, it installs them to %LOCALAPPDATA%\QtMsBuild, so they can not be used by other Windows users.
       # Download the extension and extract requited files to the project directory.
       run: |
-        Invoke-WebRequest -Uri https://ftp.fau.de/qtproject/archive/vsaddin/${{env.QT_VS_ADDIN_VERSION}}/qt-vsaddin-msvc2019-${{env.QT_VS_ADDIN_VERSION}}.vsix -MaximumRetryCount 10 -RetryIntervalSec 30 -OutFile vspackage.vsix
+        Invoke-WebRequest -Uri https://ftp.fau.de/qtproject/archive/vsaddin/${{env.QT_VS_ADDIN_VERSION}}/qt-vsaddin-msvc2019-x86-${{env.QT_VS_ADDIN_VERSION}}.vsix -MaximumRetryCount 10 -RetryIntervalSec 30 -OutFile vspackage.vsix
         Expand-Archive vspackage.vsix -DestinationPath ${{github.workspace}}/ExternalLibraries/qtvsaddin
 
     - name: Cache ZLib
@@ -270,7 +270,7 @@ jobs:
       # Also, it installs them to %LOCALAPPDATA%\QtMsBuild, so they can not be used by other Windows users.
       # Download the extension and extract requited files to the project directory.
       run: |
-        Invoke-WebRequest -Uri https://ftp.fau.de/qtproject/archive/vsaddin/${{env.QT_VS_ADDIN_VERSION}}/qt-vsaddin-msvc2019-${{env.QT_VS_ADDIN_VERSION}}.vsix -MaximumRetryCount 10 -RetryIntervalSec 30 -OutFile vspackage.vsix
+        Invoke-WebRequest -Uri https://ftp.fau.de/qtproject/archive/vsaddin/${{env.QT_VS_ADDIN_VERSION}}/qt-vsaddin-msvc2019-x86-${{env.QT_VS_ADDIN_VERSION}}.vsix -MaximumRetryCount 10 -RetryIntervalSec 30 -OutFile vspackage.vsix
         Expand-Archive vspackage.vsix -DestinationPath ${{github.workspace}}/ExternalLibraries/qtvsaddin
 
     - name: Cache ZLib

CMakeLists.txt

@@ -222,6 +222,8 @@ IF(BUILD_DOCS)
     "ModelsAPI/Stream"
     "ModelsAPI/TransformMatrix"
     "ModelsAPI/UnitParameters"
+    "ModelsAPI/UnitParametersEnum"
+    "ModelsAPI/UnitParametersManager"
     "ModelsAPI/UnitPorts"
     "BaseSolvers/AgglomerationSolver"
     "BaseSolvers/BaseSolver"

Documentation/004_development/constants.rst

@@ -39,6 +39,9 @@ Dyssol constants
 .. doxygenenum:: EUnitPort
     :project: dyssol_models_api
 
+.. doxygenenum:: EUnitParameter
+    :project: dyssol_models_api
+
 .. doxygenenum:: EPhase
     :project: dyssol_models_api
 

DyssolGUI/DyssolGUI.vcxproj

@@ -36,19 +36,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>core;gui;widgets</QtModules>
@@ -161,9 +160,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </Image>
   </ItemGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.vcxproj

@@ -57,19 +57,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -81,9 +80,6 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/CompoundsManager/CompoundsManager.vcxproj

@@ -51,19 +51,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -75,9 +74,6 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.vcxproj

@@ -51,19 +51,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -86,9 +85,6 @@
     <QtMoc>
     </QtMoc>
   </ItemDefinitionGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/FlowsheetEditor/FlowsheetEditor.cpp

@@ -68,7 +68,7 @@ void CFlowsheetEditor::InitializeConnections()
 	connect(ui.buttonAddListValue,		&QPushButton::clicked,				this, &CFlowsheetEditor::AddUnitParamListItem);
 	connect(ui.buttonRemoveListValue,	&QPushButton::clicked,				this, &CFlowsheetEditor::DeleteUnitParamListItem);
 	connect(ui.tableListValues,			&QTableWidget::itemChanged,			this, &CFlowsheetEditor::ListValueChanged);
-	connect(ui.tableListValues,			&CQtTable::PasteInitiated,			this, &CFlowsheetEditor::PasteParamTable);
+	connect(ui.tableListValues,			&CQtTable::PasteStarted,			this, &CFlowsheetEditor::PasteParamTable);
 
 
 	connect(ui.tableUnitParams,		&QTableWidget::itemSelectionChanged,	this, &CFlowsheetEditor::NewUnitParameterSelected);
@@ -532,6 +532,9 @@ void CFlowsheetEditor::UnitParamValueChanged(int _row, int _col)
 		break;
 	}
 
+	// TODO: check that this update is necessary, e.g. add some flag to all UPs that should cause an update here
+	m_pSelectedModel->GetModel()->DoCreateStructure();
+
 	UpdateUnitParamTable();
 	UpdateListValuesTable();
 

GUIDialogs/FlowsheetEditor/FlowsheetEditor.vcxproj

@@ -35,19 +35,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -102,9 +101,6 @@
   <ItemGroup>
     <ClInclude Include="GraphvizHandler.h" />
   </ItemGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/GridEditor/DimensionParameters.cpp

@@ -40,12 +40,12 @@ EDistrTypes CDimensionParameters::GetDistributionType() const
 void CDimensionParameters::SetupComboBoxDistribution() const
 {
 	[[maybe_unused]] CSignalBlocker blocker{ ui.comboDistribution };
-	const auto types = E2I(std::vector{ DISTR_TYPES });
-	const auto names = std::vector<QString>{ DISTR_NAMES };
+	const auto& types = E2I(std::vector<EDistrTypes>{ std::begin(DISTR_TYPES), std::end(DISTR_TYPES) });
+	std::vector<std::string> names{ std::begin(DISTR_NAMES), std::end(DISTR_NAMES) };;
 	ui.comboDistribution->addItem("", DISTR_UNDEFINED);
 	for (size_t i = 0; i < names.size(); ++i)
 	{
-		ui.comboDistribution->addItem(names[i], types[i]);
+		ui.comboDistribution->addItem(QString::fromStdString(names[i]), types[i]);
 		// disable compounds
 		if (types[i] == DISTR_COMPOUNDS)
 		{
@@ -54,7 +54,7 @@ void CDimensionParameters::SetupComboBoxDistribution() const
 		}
 	}
 	// always show all entries
-	ui.comboDistribution->setMaxVisibleItems(DISTRIBUTIONS_NUMBER + 1);
+	ui.comboDistribution->setMaxVisibleItems(std::size(DISTR_TYPES) + 1);
 }
 
 void CDimensionParameters::SetupComboBoxEntry() const
@@ -398,7 +398,7 @@ bool CDimensionParameters::IsValid() const
 	if (m_grid->DimensionType() == DISTR_UNDEFINED)
 		return SetMessageAndReturn(StrConst::GE_ErrorUndefined);
 	const auto iName = GetDistributionTypeIndex(static_cast<EDistrTypes>(ui.comboDistribution->currentData().toUInt()));
-	const auto distrName = iName != -1 ? std::vector<std::string>(DISTR_NAMES)[iName] : "";
+	const auto distrName = iName != -1 ? DISTR_NAMES[iName] : "";
 	if (m_grid->GridType() == EGridEntry::GRID_NUMERIC)
 	{
 		const auto& grid = dynamic_cast<CGridDimensionNumeric*>(m_grid.get())->Grid();

GUIDialogs/GridEditor/GridEditor.cpp

@@ -148,7 +148,7 @@ void CGridEditor::RemDistributionClicked()
 	if (row <= 0 || row >= ui.listDims->count()) return;
 	const auto* widget = dynamic_cast<CDimensionParameters*>(ui.listDims->itemWidget(ui.listDims->currentItem()));
 	const int iName = GetDistributionTypeIndex(widget->GetDistributionType());
-	const auto name = iName != -1 ? std::vector<QString>(DISTR_NAMES)[iName] : "";
+	const auto name = iName != -1 ? DISTR_NAMES[iName] : "";
 	const auto reply = QMessageBox::question(this, "Confirm removal", tr("Remove distribution '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No);
 	if (reply != QMessageBox::Yes) return;
 	delete ui.listDims->takeItem(row);

GUIDialogs/GridEditor/GridEditor.vcxproj

@@ -66,19 +66,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -90,9 +89,6 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

GUIDialogs/HoldupsEditor/HoldupsEditor.vcxproj

@@ -51,19 +51,18 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonDebug.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(QtMsBuild)\Qt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonQt.props" />
     <Import Project="$(SolutionDir)PropertySheets\CommonRelease.props" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QtInstall>msvc2019_64</QtInstall>
     <QtModules>widgets</QtModules>
@@ -75,9 +74,6 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />