paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-24 22:19:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5,Qt6: fixed Qt version extraction. issue #40426

Browse Source
This commit is contained in:
zeljan1 2023-08-03 10:52:59 +02:00
parent d04f10985e
commit dffc3b9594
2 changed files with 24 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lcl/interfaces/qt5/qtint.pp
View File

@ -510,43 +510,26 @@ end;
procedure QtVersionInt(out AMajor, AMinor, AMicro: integer); procedure QtVersionInt(out AMajor, AMinor, AMicro: integer);
var var
S: String; S: String;
i: Integer; AList: TStringList;
sLen: integer;
begin begin
AMajor := 0; AMajor := 0;
AMinor := 0; AMinor := 0;
AMicro := 0; AMicro := 0;
S := GetQtVersion; S := GetQtVersion;
sLen := length(S);
// 5 is usual length of qt5 version eg. 5.6.1 // 5 is usual length of qt5 version eg. 5.6.1
if sLen < 5 then if length(S) < 5 then
exit; exit;
if sLen = 5 then
begin AList := TStringList.Create;
TryStrToInt(S[1], AMajor); try
TryStrToInt(S[3], AMinor); AList.Delimiter := '.';
TryStrToInt(S[5], AMicro); AList.DelimitedText := S;
end else TryStrToInt(AList[0], AMajor);
begin TryStrToInt(AList[1], AMinor);
i := Pos('.', S); TryStrToInt(AList[2], AMicro);
// major finally
if i > 0 then AList.Free;
begin
TryStrToInt(Copy(S, 1, i -1), AMajor);
Delete(S, 1, i - 1);
end;
// minor
i := Pos('.', S);
if i > 0 then
begin
TryStrToInt(Copy(S, 1, i -1), AMinor);
Delete(S, 1, i - 1);
end;
// micro
i := Pos('.', S);
if i > 0 then
TryStrToInt(Copy(S, 1, i -1), AMinor);
end; end;
end; end;

41
lcl/interfaces/qt6/qtint.pp
View File

@ -509,43 +509,26 @@ end;
procedure QtVersionInt(out AMajor, AMinor, AMicro: integer); procedure QtVersionInt(out AMajor, AMinor, AMicro: integer);
var var
S: String; S: String;
i: Integer; AList: TStringList;
sLen: integer;
begin begin
AMajor := 0; AMajor := 0;
AMinor := 0; AMinor := 0;
AMicro := 0; AMicro := 0;
S := GetQtVersion; S := GetQtVersion;
sLen := length(S);
// 5 is usual length of qt5 version eg. 5.6.1 // 5 is usual length of qt5 version eg. 5.6.1
if sLen < 5 then if length(S) < 5 then
exit; exit;
if sLen = 5 then
begin AList := TStringList.Create;
TryStrToInt(S[1], AMajor); try
TryStrToInt(S[3], AMinor); AList.Delimiter := '.';
TryStrToInt(S[5], AMicro); AList.DelimitedText := S;
end else TryStrToInt(AList[0], AMajor);
begin TryStrToInt(AList[1], AMinor);
i := Pos('.', S); TryStrToInt(AList[2], AMicro);
// major finally
if i > 0 then AList.Free;
begin
TryStrToInt(Copy(S, 1, i -1), AMajor);
Delete(S, 1, i - 1);
end;
// minor
i := Pos('.', S);
if i > 0 then
begin
TryStrToInt(Copy(S, 1, i -1), AMinor);
Delete(S, 1, i - 1);
end;
// micro
i := Pos('.', S);
if i > 0 then
TryStrToInt(Copy(S, 1, i -1), AMinor);
end; end;
end; end;