* Merging revisions 45252 from trunk:

    ------------------------------------------------------------------------
    r45252 | michael | 2020-05-04 11:54:39 +0200 (Mon, 04 May 2020) | 1 line
    
    * Better uses clause for Delphi, less warnings
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45253 -

packages/fcl-json/src/fpjsontopas.pp

@@ -397,7 +397,8 @@ begin
   if (S<>'') and (S[1]<>',') then
     S:=', '+S;
   if jpoDelphiJSON in Options then
-    S:='JSON'+S
+    // Collections to avoid warnings about unexpanded inlines
+    S:='System.Generics.Collections, JSON'+S
   else
     S:='fpJSON'+S;
   S:='SysUtils, Classes, '+S;