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

Merged revision(s) 43180 #d29e9fa0b6, 43182 #b12831f099, 43188-43189 #b271c77ae6-#b271c77ae6 from trunk:

Browse Source 
Qt: fixed regression in owner drawn combobox from rev.43135. issue #25172
........
IDE: Compare TargetOS without case sensitivity. The default value is lowercase.
........
sqldb: TSQLDBLibraryLoader, TPQEventMonitor, TFBEventMonitor and TFBAdmin were backported to FPC 2.6.3
........
Debugger: Fix handling of single quote in strings returned by gdb
........

git-svn-id: branches/fixes_1_2@43256 -
This commit is contained in:
martin 2013-10-15 13:53:26 +00:00
parent f41b62a98f
commit 93fed7a20a
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/sqldb/registersqldb.pas
View File

@ -41,12 +41,11 @@ unit registersqldb;
{$ENDIF}
{$ENDIF}
{$IF FPC_FULLVERSION>= 20700}
// FBAdmin component introduced in FPC 2.7
{$DEFINE HASFBADMIN}
{$DEFINE HASPQEVENT}
{$DEFINE HASFBEVENT}
{$DEFINE HASLIBLOADER}
{$IF FPC_FULLVERSION >= 20604}
{$DEFINE HASFBADMIN}
{$DEFINE HASPQEVENT}
{$DEFINE HASFBEVENT}
{$DEFINE HASLIBLOADER}
{$ENDIF}
{$IFNDEF Solaris}

9
debugger/debugutils.pp
View File

@ -389,7 +389,14 @@ begin
while i < length(AValue) do begin
inc(i);
If AValue[i] = '''' then begin
InQuote := not InQuote;
if InQuote and (i < length(AValue)) and (AValue[i+1] = '''') then begin
inc(i);
inc(j);
Result[j] := '''';
end
else begin
InQuote := not InQuote;
end;
continue;
end;
if InQuote or not(AValue[i] = '#' ) then begin

2
ide/frames/compiler_config_target.pas
View File

@ -196,7 +196,7 @@ begin
end;
DebugLn(['TCompilerConfigTargetFrame.UpdateTargetSpecific: TargetOS=',aTargetOS,DbgMsg]);
// Now hide/show the whole GroupBox because there is only one setting.
grbTargetOptions.Visible := AnsiStartsStr('Win', aTargetOS);
grbTargetOptions.Visible := AnsiStartsText('Win', aTargetOS);
end;
procedure TCompilerConfigTargetFrame.UpdateByTargetCPU(aTargetCPU: string);

2
lcl/interfaces/qt/qtwidgets.pas
View File

@ -11374,7 +11374,7 @@ var
SkipDefault: Boolean;
Item: QListWidgetItemH;
begin
if ViewStyle >= 0 then
if (ViewStyle >= 0) and not (FChildOfComplexWidget = ccwComboBox) then
begin
State := QStyleOption_state(option);
ACustomState := [cdsDefault];