From 93fed7a20a687f121271840b3ebcbbeb3fea92e7 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Tue, 15 Oct 2013 13:53:26 +0000
Subject: [PATCH] Merged revision(s) 43180 #d29e9fa0b6, 43182 #b12831f099,
 43188-43189 #b271c77ae6-#b271c77ae6 from trunk: 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 -
---
 components/sqldb/registersqldb.pas    | 11 +++++------
 debugger/debugutils.pp                |  9 ++++++++-
 ide/frames/compiler_config_target.pas |  2 +-
 lcl/interfaces/qt/qtwidgets.pas       |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/components/sqldb/registersqldb.pas b/components/sqldb/registersqldb.pas
index ff584cb001..8d9d80d4fc 100644
--- a/components/sqldb/registersqldb.pas
+++ b/components/sqldb/registersqldb.pas
@@ -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}
diff --git a/debugger/debugutils.pp b/debugger/debugutils.pp
index 3a2ab791dd..a8f9f4a22d 100644
--- a/debugger/debugutils.pp
+++ b/debugger/debugutils.pp
@@ -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
diff --git a/ide/frames/compiler_config_target.pas b/ide/frames/compiler_config_target.pas
index 017cd18646..3846175af3 100644
--- a/ide/frames/compiler_config_target.pas
+++ b/ide/frames/compiler_config_target.pas
@@ -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);
diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas
index 6864fc9bc5..a658efafef 100644
--- a/lcl/interfaces/qt/qtwidgets.pas
+++ b/lcl/interfaces/qt/qtwidgets.pas
@@ -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];