aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtprojectlib/ProjectExporter.cs
diff options
context:
space:
mode:
authorMiguel Costa <miguel.costa@qt.io>2019-07-08 16:16:15 +0200
committerMiguel Costa <miguel.costa@qt.io>2019-08-05 09:24:17 +0000
commitcff73364c3b632a84ab3c7ca2f2ea32b563910ce (patch)
tree41d0c87644f3322aa29709bae3d58529511cd7fc /src/qtprojectlib/ProjectExporter.cs
parent3e7709dcf5927f5674cccc253ecefae3ab758166 (diff)
Add C++ compiler properties to Qt tools
Qt tools that generate C++ code will now include all properties available in the C++ compiler property page, allowing the default values of the C++ compiler properties to be used directly by the Qt tools, without the need to actively monitor changes to maintain properties synchronized. It is also possible to extend (i.e. append to) or override (i.e. replace) the default C++ property values for Qt tools. Task-number: QTVSADDINBUG-575 Task-number: QTVSADDINBUG-632 Change-Id: I456ee6b4926cd11c83c845656a617a4fb204542a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/qtprojectlib/ProjectExporter.cs')
-rw-r--r--src/qtprojectlib/ProjectExporter.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qtprojectlib/ProjectExporter.cs b/src/qtprojectlib/ProjectExporter.cs
index e70b6060..a1cbd7be 100644
--- a/src/qtprojectlib/ProjectExporter.cs
+++ b/src/qtprojectlib/ProjectExporter.cs
@@ -417,6 +417,9 @@ namespace QtProjectLib
private static void AddIncludePaths(Project project, ProFileOption option, string includePaths)
{
+ if (QtProject.GetFormatVersion(project) >= Resources.qtMinFormatVersion_ClProperties)
+ return;
+
if (includePaths == null)
return;
@@ -449,6 +452,9 @@ namespace QtProjectLib
private static void AddLibraries(Project project, ProFileOption option, string paths, string deps)
{
+ if (QtProject.GetFormatVersion(project) < Resources.qtMinFormatVersion_ClProperties)
+ return;
+
var versionManager = QtVersionManager.The();
var qtDir = versionManager.GetInstallPath(project);
if (qtDir == null)