1 files changed, 9 insertions, 25 deletions

diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index e5f341704df..4841709e6d1 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -1,16 +1,13 @@
-import qbs 1.0
 import qbs.FileInfo
 import qbs.Utilities
-import QtcFunctions
 
 Product {
-    name: project.name
     version: qtc.qtcreator_version
+
     property bool install: true
     property string installDir
     property string installSourceBase: destinationDirectory
     property stringList installTags: type
-    property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs"
     property bool useNonGuiPchFile: false
     property bool useGuiPchFile: false
     property bool useQt: true
@@ -20,15 +17,6 @@ Product {
     property bool sanitizable: true
 
     Depends { name: "cpp" }
-    Depends { name: "qtc" }
-    Depends {
-        name: product.name + " dev headers";
-        required: false
-        Properties {
-            condition: Utilities.versionCompare(qbs.version, "1.13") >= 0
-            enableFallback: false
-        }
-    }
     Depends {
         name: "Qt"
         condition: useQt
@@ -36,10 +24,7 @@ Product {
         versionAtLeast: "6.2.0"
     }
 
-    // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that
-    //       atm. Conditionally pulling in a module that sets the property is also not possible,
-    //       because conflicting scalar values would be reported (QBS-1225 would fix that).
-    cpp.minimumMacosVersion: project.minimumMacosVersion
+    Depends { name: "qtc" }
 
     cpp.cxxFlags: {
         var flags = [];
@@ -62,7 +47,8 @@ Product {
         }
         return flags;
     }
-
+    cpp.cxxLanguageVersion: "c++17"
+    cpp.defines: qtc.generalDefines
     Properties {
         condition: sanitizable && qbs.toolchain.contains("gcc")
         cpp.driverFlags: {
@@ -76,9 +62,7 @@ Product {
             return flags;
         }
     }
-
-    cpp.cxxLanguageVersion: "c++17"
-    cpp.defines: qtc.generalDefines
+    cpp.minimumMacosVersion: "10.15"
     cpp.minimumWindowsVersion: "6.1"
     cpp.useCxxPrecompiledHeader: useQt && (useNonGuiPchFile || useGuiPchFile)
     cpp.visibility: "minimal"
@@ -94,15 +78,15 @@ Product {
         name: "standard pch file (non-gui)"
         condition: useNonGuiPchFile
         prefix: pathToSharedSources + '/'
-        files: ["qtcreator_pch.h"]
-        fileTags: ["cpp_pch_src"]
+        files: "qtcreator_pch.h"
+        fileTags: "cpp_pch_src"
     }
 
     Group {
         name: "standard pch file (gui)"
         condition: useGuiPchFile
         prefix: pathToSharedSources + '/'
-        files: ["qtcreator_gui_pch.h"]
-        fileTags: ["cpp_pch_src"]
+        files: "qtcreator_gui_pch.h"
+        fileTags: "cpp_pch_src"
     }
 }