diff --git a/ide/exttools.pas b/ide/exttools.pas
index 7592c9cbc4..42f22a06ee 100644
--- a/ide/exttools.pas
+++ b/ide/exttools.pas
@@ -1217,7 +1217,9 @@ end;
 destructor TExternalTools.Destroy;
 begin
   RunExternalTool:=nil;
+  DebugLn('TExternalTools.Destroy: Terminating All.');
   TerminateAll;
+  DebugLn('TExternalTools.Destroy: Entering critical section.');
   EnterCriticalSection;
   try
     if fRunning.Count>0 then
diff --git a/lcl/comboex.pas b/lcl/comboex.pas
index 7b23710d8a..d7b93a0a17 100644
--- a/lcl/comboex.pas
+++ b/lcl/comboex.pas
@@ -248,7 +248,6 @@ type
     property ParentFont;
     property ParentShowHint;
     property PopupMenu;
-    property ReadOnly;
     property ShowHint;
     property Style;
     property StyleEx;
diff --git a/lcl/include/customcombobox.inc b/lcl/include/customcombobox.inc
index 649e8a52e5..a8f5075240 100644
--- a/lcl/include/customcombobox.inc
+++ b/lcl/include/customcombobox.inc
@@ -189,11 +189,6 @@ begin
   Result := FMaxLength;
 end;
 
-function TCustomComboBox.GetReadOnly: Boolean;
-begin
-  Result := Style in [csDropDownList, csOwnerDrawFixed, csOwnerDrawVariable];
-end;
-
 {------------------------------------------------------------------------------
   Method: TCustomComboBox.LMChanged
   Params: msg -
diff --git a/lcl/interfaces/qt/qtwsstdctrls.pp b/lcl/interfaces/qt/qtwsstdctrls.pp
index 82627ba90b..4b5fbb990a 100644
--- a/lcl/interfaces/qt/qtwsstdctrls.pp
+++ b/lcl/interfaces/qt/qtwsstdctrls.pp
@@ -1699,7 +1699,8 @@ begin
     ACombo := QComboBox_create(nil);
     try
       QWidget_setFont(ACombo, ComboBox.getFont);
-      QComboBox_setEditable(ACombo, not ACustomComboBox.ReadOnly);
+      QComboBox_setEditable(ACombo,
+        not (ACustomComboBox.Style in [csDropDownList,csOwnerDrawFixed,csOwnerDrawVariable]));
       AText := 'Mtjx';
       AItems := QStringList_create(@AText);
       QComboBox_addItems(ACombo, AItems);
diff --git a/lcl/interfaces/qt5/qtwsstdctrls.pp b/lcl/interfaces/qt5/qtwsstdctrls.pp
index 6dac163f9f..858ed53fde 100644
--- a/lcl/interfaces/qt5/qtwsstdctrls.pp
+++ b/lcl/interfaces/qt5/qtwsstdctrls.pp
@@ -1644,7 +1644,8 @@ begin
     ACombo := QComboBox_create(nil);
     try
       QWidget_setFont(ACombo, ComboBox.getFont);
-      QComboBox_setEditable(ACombo, not ACustomComboBox.ReadOnly);
+      QComboBox_setEditable(ACombo,
+        not (ACustomComboBox.Style in [csDropDownList,csOwnerDrawFixed,csOwnerDrawVariable]));
       AText := 'Mtjx';
       AItems := QStringList_create(PWideString(@AText));
       QComboBox_addItems(ACombo, AItems);
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index feeda55d23..2587e76760 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -299,7 +299,6 @@ type
     function GetAutoComplete: boolean;
     function GetDroppedDown: Boolean;
     function GetItemWidth: Integer;
-    function GetReadOnly: Boolean;
     procedure SetAutoComplete(const AValue: boolean);
     procedure SetItemWidth(const AValue: Integer);
     procedure LMDrawListItem(var TheMessage: TLMDrawListItem); message LM_DrawListItem;
@@ -403,7 +402,6 @@ type
     property DropDownCount: Integer read FDropDownCount write SetDropDownCount default 8;
     property Items: TStrings read FItems write SetItems;
     property ItemIndex: integer read GetItemIndex write SetItemIndex default -1;
-    property ReadOnly: Boolean read GetReadOnly stored False;
     property SelLength: integer read GetSelLength write SetSelLength;// UTF-8 length
     property SelStart: integer read GetSelStart write SetSelStart;// UTF-8 position
     property SelText: String read GetSelText write SetSelText;