Merge branch 'develop'

DelphiPraxis · Nov 10, 2020 · 0332033 · 0332033
2 parents f753c1d + e93e577
commit 0332033
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Quick.RTTI.Utils.pas b/Quick.RTTI.Utils.pas
@@ -7,7 +7,7 @@
   Author      : Kike Pérez
   Version     : 1.4
   Created     : 09/03/2018
-  Modified    : 14/07/2020
+  Modified    : 05/11/2020
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
@@ -143,15 +143,14 @@ class function TRTTI.CallMethod(aObject : TObject; const aMethodName : string; a
   rtype : TRttiType;
   rmethod : TRttiMethod;
   rinstype: TRttiInstanceType;
-  value : TValue;
 begin
   rtype := fCtx.GetType(aObject.ClassInfo);
   for rmethod in rtype.GetMethods do
   begin
     if CompareText(rmethod.Name,aMethodName) = 0 then
     begin
       rinstype := rtype.AsInstance;
-      value := rmethod.Invoke(rinstype.MetaclassType,aParams);
+      Result := rmethod.Invoke(rinstype.MetaclassType,aParams);
     end;
 
   end;

diff --git a/QuickLib.inc b/QuickLib.inc
@@ -131,7 +131,7 @@
     {$if CompilerVersion >= 34.0} //Delphi RX10.4 Sydney
       {$define DELPHIRX104_UP}
 	    {$define DELPHISYDNEY_UP}
-      {$if defined(ANDROID) OR defined(LINUX) OR defined(IOS)}
+      {$if defined(ANDROID) OR defined(IOS)}
         {$define NEXTGEN} //compatibility with older delphis
       {$endif}
     {$ifend}