Обновление до версии 2.9.0

giy

2022-09-02 ca47896204482bf4a6979e3838bf7f09f61cebeb

 QtVsTools.Core/QtModule.cs

@@ -28,7 +28,6 @@


using System;

using System.Collections.Generic;

using System.IO;



namespace QtVsTools.Core

{

@@ -38,12 +37,12 @@
        public bool Selectable;

        public List<string> Defines = new List<string>();

        public string LibraryPrefix = string.Empty;

        public bool HasDLL = true;

        public List<string> AdditionalLibraries = new List<string>();

        public List<string> AdditionalLibrariesDebug = new List<string>();

        public List<string> IncludePath = new List<string>();

        public string proVarQT;

        public string proVarCONFIG;

        private string majorVersion;



        public string LibRelease

        {

@@ -51,7 +50,7 @@
            {

                return

                    LibraryPrefix.StartsWith("Qt", StringComparison.Ordinal)

                        ? "Qt5" + LibraryPrefix.Substring(2) + ".lib"

                        ? "Qt" + majorVersion + LibraryPrefix.Substring(2) + ".lib"

                        : LibraryPrefix + ".lib";

            }

        }

@@ -62,14 +61,15 @@
            {

                return

                    LibraryPrefix.StartsWith("Qt", StringComparison.Ordinal)

                        ? "Qt5" + LibraryPrefix.Substring(2) + "d.lib"

                        ? "Qt" + majorVersion + LibraryPrefix.Substring(2) + "d.lib"

                        : LibraryPrefix + "d.lib";

            }

        }



        public QtModule(int id)

        public QtModule(int id, string major)

        {

            Id = id;

            majorVersion = major;

        }



        public int Id { get; } = -1;

@@ -90,7 +90,7 @@
            var libs = new List<string>();

            var libName = LibraryPrefix;

            if (libName.StartsWith("Qt", StringComparison.Ordinal))

                libName = "Qt5" + libName.Substring(2);

                libName = "Qt" + majorVersion + libName.Substring(2);

            libName += libInfix;

            if (isDebugCfg)

                libName += "d";