* Merging revisions 1028 from trunk:

    ------------------------------------------------------------------------
    r1028 | michael | 2020-12-28 12:51:21 +0100 (Mon, 28 Dec 2020) | 1 line
    
    * Fix StringReplace not working on ? (bug ID 38224)
    ------------------------------------------------------------------------

packages/rtl/sysutils.pas

@@ -2756,7 +2756,7 @@ begin
 end;
 
 Const
-  RESpecials = '([\$\+\[\]\(\)\\\.\*\^])';
+  RESpecials = '([\$\+\[\]\(\)\\\.\*\^\?])';
 
 function StringReplace(aOriginal, aSearch, aReplace: string;
   Flags: TStringReplaceFlags): String;