Mercurial Repositories > eric / changeset

--- a/eric7.epj	Fri May 21 18:01:11 2021 +0200
+++ b/eric7.epj	Fri May 21 20:14:48 2021 +0200
@@ -1077,7 +1077,6 @@
       "eric7/E5Gui/E5AnimatedWidget.py",
       "eric7/E5Gui/E5Application.py",
       "eric7/E5Gui/E5ClickableLabel.py",
-      "eric7/E5Gui/E5ComboBox.py",
       "eric7/E5Gui/E5ComboSelectionDialog.py",
       "eric7/E5Gui/E5Completers.py",
       "eric7/E5Gui/E5ErrorMessage.py",

--- a/eric7/CondaInterface/CondaNewEnvironmentDataDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/CondaInterface/CondaNewEnvironmentDataDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -25,13 +25,16 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5ClearableLineEdit" name="nameEdit">
+    <widget class="QLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter a unique name for the virtual environment to register it with the Virtual Environment Manager</string>
      </property>
      <property name="placeholderText">
       <string>Name for registration of the virtual environment</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -42,13 +45,16 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="E5ClearableLineEdit" name="condaNameEdit">
+    <widget class="QLineEdit" name="condaNameEdit">
      <property name="toolTip">
       <string>Enter the name of the virtual environment in Conda</string>
      </property>
      <property name="placeholderText">
       <string>Name of the virtual environment in Conda</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
@@ -85,11 +91,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5PathPicker</class>
    <extends>QWidget</extends>
    <header>E5Gui/E5PathPicker.h</header>

--- a/eric7/Cooperation/ChatWidget.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.py	Fri May 21 20:14:48 2021 +0200
@@ -66,6 +66,8 @@
         self.cancelEditButton.setIcon(
             UI.PixmapCache.getIcon("sharedEditCancel"))
         
+        self.hostEdit.lineEdit().setClearButtonEnabled(True)
+        
         self.__ui = ui
         self.__client = CooperationClient(self)
         self.__myNickName = self.__client.nickName()

--- a/eric7/Cooperation/ChatWidget.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.ui	Fri May 21 20:14:48 2021 +0200
@@ -77,10 +77,13 @@
        </widget>
       </item>
       <item>
-       <widget class="E5ClearableLineEdit" name="messageEdit">
+       <widget class="QLineEdit" name="messageEdit">
         <property name="toolTip">
          <string>Enter the text to send</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -199,7 +202,7 @@
          </widget>
         </item>
         <item>
-         <widget class="E5ClearableComboBox" name="hostEdit">
+         <widget class="QComboBox" name="hostEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -327,21 +330,11 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5Led</class>
    <extends>QWidget</extends>
    <header>E5Gui/E5Led.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableComboBox</class>
-   <extends>QComboBox</extends>
-   <header>E5Gui/E5ComboBox.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>serverButton</tabstop>

--- a/eric7/DataViews/CodeMetricsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/DataViews/CodeMetricsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -30,7 +30,16 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -41,10 +50,13 @@
        </widget>
       </item>
       <item>
-       <widget class="E5ClearableLineEdit" name="excludeFilesEdit">
+       <widget class="QLineEdit" name="excludeFilesEdit">
         <property name="toolTip">
          <string>Enter filename patterns of files to be excluded separated by a comma</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -172,13 +184,6 @@
   </layout>
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>startButton</tabstop>
   <tabstop>excludeFilesEdit</tabstop>

--- a/eric7/E5Gui/E5ComboBox.py	Fri May 21 18:01:11 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2012 - 2021 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing combobox classes using the eric line edits.
-"""
-
-from PyQt6.QtWidgets import QComboBox
-
-
-class E5ComboBox(QComboBox):
-    """
-    Class implementing a combobox using the eric line edit.
-    """
-    def __init__(self, parent=None, inactiveText=""):
-        """
-        Constructor
-        
-        @param parent reference to the parent widget (QWidget)
-        @param inactiveText text to be shown on inactivity (string)
-        """
-        super().__init__(parent)
-        
-        self.setMinimumHeight(24)
-        
-        from .E5LineEdit import E5LineEdit
-        self.__lineedit = E5LineEdit(self, inactiveText)
-        self.setLineEdit(self.__lineedit)
-        
-        self.setMinimumHeight(self.__lineedit.minimumHeight() + 3)
-    
-    def inactiveText(self):
-        """
-        Public method to get the inactive text.
-        
-        @return inactive text (string)
-        """
-        return self.lineEdit().inactiveText()
-    
-    def setInactiveText(self, inactiveText):
-        """
-        Public method to set the inactive text.
-        
-        @param inactiveText text to be shown on inactivity (string)
-        """
-        self.lineEdit().setInactiveText(inactiveText)
-
-
-class E5ClearableComboBox(E5ComboBox):
-    """
-    Class implementing a combobox using the eric line edit.
-    """
-    def __init__(self, parent=None, inactiveText=""):
-        """
-        Constructor
-        
-        @param parent reference to the parent widget (QWidget)
-        @param inactiveText text to be shown on inactivity (string)
-        """
-        super().__init__(parent, inactiveText)
-        
-        from .E5LineEdit import E5ClearableLineEdit
-        self.__lineedit = E5ClearableLineEdit(self, inactiveText)
-        self.setLineEdit(self.__lineedit)

--- a/eric7/E5Gui/E5FileSaveConfirmDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5FileSaveConfirmDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -9,10 +9,11 @@
 
 import os
 
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
+from PyQt6.QtWidgets import (
+    QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit
+)
 
 from .E5PathPicker import E5PathPicker, E5PathPickerModes
-from .E5LineEdit import E5ClearableLineEdit
 
 
 class E5FileSaveConfirmDialog(QDialog):
@@ -55,7 +56,8 @@
             self.__pathPicker = E5PathPicker(self)
             self.__pathPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         else:
-            self.__pathPicker = E5ClearableLineEdit(self)
+            self.__pathPicker = QLineEdit(self)
+            self.__pathPicker.setClearButtonEnabled(True)
         
         self.__buttonBox = QDialogButtonBox(self)
         self.__cancelButton = self.__buttonBox.addButton(

--- a/eric7/E5Gui/E5LineEdit.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5LineEdit.py	Fri May 21 20:14:48 2021 +0200
@@ -56,18 +56,20 @@
     """
     Class implementing a line edit widget showing some inactive text.
     """
-    def __init__(self, parent=None, inactiveText=""):
+    def __init__(self, parent=None, placeholderText=""):
         """
         Constructor
         
-        @param parent reference to the parent widget (QWidget)
-        @param inactiveText text to be shown on inactivity (string)
+        @param parent reference to the parent widget
+        @type QWidget
+        @param placeholderText text to be shown on inactivity
+        @type str
         """
         super().__init__(parent)
         
         self.setMinimumHeight(22)
         
-        self.setPlaceholderText(inactiveText)
+        self.setPlaceholderText(placeholderText)
         
         self.__mainLayout = QHBoxLayout(self)
         self.__mainLayout.setContentsMargins(0, 0, 0, 0)
@@ -239,41 +241,24 @@
         if w == 0:
             return 0
         return w + spacing * 2
-    
-    def inactiveText(self):
-        """
-        Public method to get the inactive text.
-        
-        @return inactive text (string)
-        """
-        return self.placeholderText()
-    
-    def setInactiveText(self, inactiveText):
-        """
-        Public method to set the inactive text.
-        
-        @param inactiveText text to be shown on inactivity (string)
-        """
-        self.setPlaceholderText(inactiveText)
-
 
 class E5ClearableLineEdit(E5LineEdit):
     """
     Class implementing a line edit widget showing some inactive text and a
     clear button, if it has some contents.
     """
-    def __init__(self, parent=None, inactiveText="",
+    def __init__(self, parent=None, placeholderText="",
                  side=E5LineEditSide.RIGHT):
         """
         Constructor
         
         @param parent reference to the parent widget
         @type QWidget
-        @param inactiveText text to be shown on inactivity
+        @param placeholderText text to be shown on inactivity
         @type str
         @param side side the clear button should be shown at
         @type E5LineEditSide
         """
-        super().__init__(parent, inactiveText)
+        super().__init__(parent, placeholderText)
         
         self.setClearButtonEnabled(True)

--- a/eric7/E5Gui/E5PathPicker.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5PathPicker.py	Fri May 21 20:14:48 2021 +0200
@@ -11,12 +11,12 @@
 import os
 
 from PyQt6.QtCore import pyqtSignal, Qt, QFileInfo, QCoreApplication, QDir
-from PyQt6.QtWidgets import QWidget, QHBoxLayout, QToolButton, QSizePolicy
+from PyQt6.QtWidgets import (
+    QWidget, QHBoxLayout, QToolButton, QSizePolicy, QLineEdit, QComboBox
+)
 
 from . import E5FileDialog
-from .E5LineEdit import E5ClearableLineEdit
 from .E5Completers import E5FileCompleter, E5DirCompleter
-from .E5ComboBox import E5ClearableComboBox
 
 import UI.PixmapCache
 
@@ -86,13 +86,17 @@
         self.setLayout(self.__layout)
         
         if useLineEdit:
-            self._editor = E5ClearableLineEdit(
+            self._editor = QLineEdit(
                 self, QCoreApplication.translate(
                     "E5PathPickerBase", "Enter Path Name"))
+            self._editor.setClearButtonEnabled(True)
         else:
-            self._editor = E5ClearableComboBox(
-                self, QCoreApplication.translate(
+            self._editor = QComboBox(self)
+            self._editor.setEditable(True)
+            self._editor.lineEdit().setPlaceholderText(
+                QCoreApplication.translate(
                     "E5PathPickerBase", "Enter Path Name"))
+            self._editor.lineEdit().setClearButtonEnabled(True)
         
         self.__button = QToolButton(self)
         self.__button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
@@ -155,10 +159,10 @@
                 
                 # set inactive text
                 if mode == E5PathPickerModes.OPEN_FILES_MODE:
-                    self._editor.setInactiveText(
+                    self._editor.setPlaceholderText(
                         self.tr("Enter Path Names separated by ';'"))
                 else:
-                    self._editor.setInactiveText(
+                    self._editor.setPlaceholderText(
                         self.tr("Enter Path Name"))
         self.__button.setEnabled(self.__mode != E5PathPickerModes.NO_MODE)
     

--- a/eric7/E5Gui/E5ProcessDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5ProcessDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -110,10 +110,13 @@
        </widget>
       </item>
       <item row="0" column="0" colspan="3">
-       <widget class="E5ClearableLineEdit" name="input">
+       <widget class="QLineEdit" name="input">
         <property name="toolTip">
          <string>Enter data to be sent to the running process</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -145,13 +148,6 @@
   </layout>
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>resultbox</tabstop>
   <tabstop>errors</tabstop>

--- a/eric7/E5Gui/E5StringListEditWidget.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5StringListEditWidget.ui	Fri May 21 20:14:48 2021 +0200
@@ -32,7 +32,7 @@
       <number>0</number>
      </property>
      <item row="0" column="1">
-      <widget class="E5ClearableLineEdit" name="searchEdit">
+      <widget class="QLineEdit" name="searchEdit">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -48,6 +48,9 @@
        <property name="toolTip">
         <string>Enter search term for strings</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="0" column="0">
@@ -152,11 +155,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5ListView</class>
    <extends>QListView</extends>
    <header>E5Gui/E5ListView.h</header>

--- a/eric7/E5Gui/E5TextEditSearchWidget.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5TextEditSearchWidget.py	Fri May 21 20:14:48 2021 +0200
@@ -16,8 +16,6 @@
     QToolButton, QSizePolicy
 )
 
-from E5Gui.E5ComboBox import E5ClearableComboBox
-
 import UI.PixmapCache
 
 
@@ -95,7 +93,9 @@
         self.label.setText(self.tr("Find:"))
         self.horizontalLayout1.addWidget(self.label)
         
-        self.findtextCombo = E5ClearableComboBox(self)
+        self.findtextCombo = QComboBox(self)
+        self.findtextCombo.setEditable(True)
+        self.findtextCombo.lineEdit().setClearButtonEnabled(True)
         sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding,
                                  QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)

--- a/eric7/E5Gui/E5TextInputDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5TextInputDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -11,8 +11,6 @@
     QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit
 )
 
-from E5Gui.E5LineEdit import E5ClearableLineEdit
-
 
 class E5TextInputDialog(QDialog):
     """
@@ -34,7 +32,8 @@
         self.__label = QLabel(self)
         self.__layout.addWidget(self.__label)
         
-        self.__lineEdit = E5ClearableLineEdit(self)
+        self.__lineEdit = QLineEdit(self)
+        self.__lineEdit.setClearButtonEnabled(True)
         self.__layout.addWidget(self.__lineEdit)
         
         self.__buttonBox = QDialogButtonBox(

--- a/eric7/MicroPython/EspFirmwareSelectionDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/MicroPython/EspFirmwareSelectionDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -125,13 +125,16 @@
       </widget>
      </item>
      <item row="4" column="1" colspan="2">
-      <widget class="E5ClearableLineEdit" name="addressEdit">
+      <widget class="QLineEdit" name="addressEdit">
        <property name="toolTip">
         <string>Enter the flash addres in the hexadecimal form</string>
        </property>
        <property name="maxLength">
         <number>4</number>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -155,11 +158,6 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>espComboBox</tabstop>

--- a/eric7/Network/IRC/IrcChannelWidget.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Network/IRC/IrcChannelWidget.ui	Fri May 21 20:14:48 2021 +0200
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>3</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -96,6 +105,9 @@
      <property name="placeholderText">
       <string>Enter a message, send by pressing Return or Enter</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>

--- a/eric7/Network/IRC/IrcMessageEdit.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Network/IRC/IrcMessageEdit.py	Fri May 21 20:14:48 2021 +0200
@@ -8,29 +8,23 @@
 """
 
 from PyQt6.QtCore import Qt
-
-from E5Gui.E5LineEdit import E5LineEditSide, E5ClearableLineEdit
+from PyQt6.QtWidgets import QLineEdit
 
 
-class IrcMessageEdit(E5ClearableLineEdit):
+class IrcMessageEdit(QLineEdit):
     """
     Class implementing a specialized line edit for entering IRC messages.
     """
     MaxHistory = 100
     
-    def __init__(self, parent=None, inactiveText="",
-                 side=E5LineEditSide.RIGHT):
+    def __init__(self, parent=None):
         """
         Constructor
         
         @param parent reference to the parent widget
         @type QWidget
-        @param inactiveText text to be shown on inactivity
-        @type str
-        @param side side the clear button should be shown at
-        @type E5LineEditSide
         """
-        super().__init__(parent, inactiveText, side)
+        super().__init__(parent)
         
         self.__historyList = [""]   # initialize with one empty line
         self.__historyLine = 0

--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>112</height>
+    <height>132</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,10 +35,13 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="E5ClearableLineEdit" name="leftEdit">
+    <widget class="QLineEdit" name="leftEdit">
      <property name="placeholderText">
       <string>Enter left hand side of assignment</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
@@ -49,10 +52,13 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="E5ClearableLineEdit" name="rightEdit">
+    <widget class="QLineEdit" name="rightEdit">
      <property name="placeholderText">
       <string>Enter right hand side of assignment</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
@@ -67,13 +73,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>

--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -35,7 +35,7 @@
        <item>
         <widget class="QTabWidget" name="optionsTabWidget">
          <property name="currentIndex">
-          <number>1</number>
+          <number>2</number>
          </property>
          <widget class="QWidget" name="globalOptionsTab">
           <attribute name="title">
@@ -70,10 +70,13 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="E5ClearableLineEdit" name="excludeFilesEdit">
+            <widget class="QLineEdit" name="excludeFilesEdit">
              <property name="toolTip">
               <string>Enter filename patterns of files to be excluded separated by a comma</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0">
@@ -84,10 +87,13 @@
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="E5ClearableLineEdit" name="excludeMessagesEdit">
+            <widget class="QLineEdit" name="excludeMessagesEdit">
              <property name="toolTip">
               <string>Enter message codes to be excluded separated by a comma</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="2">
@@ -105,10 +111,13 @@
             </widget>
            </item>
            <item row="3" column="1">
-            <widget class="E5ClearableLineEdit" name="includeMessagesEdit">
+            <widget class="QLineEdit" name="includeMessagesEdit">
              <property name="toolTip">
               <string>Enter message codes to be included separated by a comma</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="2">
@@ -126,10 +135,13 @@
             </widget>
            </item>
            <item row="4" column="1">
-            <widget class="E5ClearableLineEdit" name="fixIssuesEdit">
+            <widget class="QLineEdit" name="fixIssuesEdit">
              <property name="toolTip">
               <string>Enter message codes of issues to be fixed automatically (leave empty to fix all)</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="2">
@@ -147,10 +159,13 @@
             </widget>
            </item>
            <item row="5" column="1">
-            <widget class="E5ClearableLineEdit" name="noFixIssuesEdit">
+            <widget class="QLineEdit" name="noFixIssuesEdit">
              <property name="toolTip">
               <string>Enter message codes of issues not to be fixed automatically</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="2">
@@ -469,10 +484,13 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="E5ClearableLineEdit" name="encodingsEdit">
+                   <widget class="QLineEdit" name="encodingsEdit">
                     <property name="toolTip">
                      <string>Enter valid encodings separated by a comma (leave empty to use defaults)</string>
                     </property>
+                    <property name="clearButtonEnabled">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                  </layout>
@@ -525,10 +543,13 @@
                    </widget>
                   </item>
                   <item row="1" column="1" colspan="2">
-                   <widget class="E5ClearableLineEdit" name="copyrightAuthorEdit">
+                   <widget class="QLineEdit" name="copyrightAuthorEdit">
                     <property name="toolTip">
                      <string>Enter a copyright author name to check for (leave empty to omit this check)</string>
                     </property>
+                    <property name="clearButtonEnabled">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                  </layout>
@@ -952,10 +973,13 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="E5ClearableLineEdit" name="dispatchDecoratorEdit">
+                   <widget class="QLineEdit" name="dispatchDecoratorEdit">
                     <property name="toolTip">
                      <string>Enter the list of dispatch decorators separated by comma</string>
                     </property>
+                    <property name="clearButtonEnabled">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                   <item>
@@ -966,10 +990,13 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="E5ClearableLineEdit" name="overloadDecoratorEdit">
+                   <widget class="QLineEdit" name="overloadDecoratorEdit">
                     <property name="toolTip">
                      <string>Enter the list of typing.overload decorators separated by comma</string>
                     </property>
+                    <property name="clearButtonEnabled">
+                     <bool>true</bool>
+                    </property>
                    </widget>
                   </item>
                  </layout>
@@ -1198,10 +1225,13 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="E5ClearableLineEdit" name="hashesEdit">
+            <widget class="QLineEdit" name="hashesEdit">
              <property name="toolTip">
               <string>Enter a list of hash methods to be considered insecure separated by comma</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" colspan="2">
@@ -1577,11 +1607,6 @@
    <extends>QLabel</extends>
    <header>E5Gui/E5SqueezeLabels.h</header>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>mainWidget</tabstop>

--- a/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -31,7 +31,16 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -42,10 +51,13 @@
        </widget>
       </item>
       <item>
-       <widget class="E5ClearableLineEdit" name="excludeFilesEdit">
+       <widget class="QLineEdit" name="excludeFilesEdit">
         <property name="toolTip">
          <string>Enter filename patterns of files to be excluded separated by a comma</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -150,11 +162,6 @@
    <extends>QLabel</extends>
    <header>E5Gui/E5SqueezeLabels.h</header>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>startButton</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -114,10 +114,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rxEdit">
+      <widget class="QLineEdit" name="rxEdit">
        <property name="toolTip">
         <string>Enter the regular expression to filter on or search for</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
@@ -588,13 +591,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>actionsButton</tabstop>
   <tabstop>modeComboBox</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>184</height>
+    <height>185</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,10 +31,13 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="firstNameEdit">
+       <widget class="QLineEdit" name="firstNameEdit">
         <property name="toolTip">
          <string>Enter the first name</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -45,10 +48,13 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="E5ClearableLineEdit" name="lastNameEdit">
+       <widget class="QLineEdit" name="lastNameEdit">
         <property name="toolTip">
          <string>Enter the last name</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -59,10 +65,13 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="emailEdit">
+       <widget class="QLineEdit" name="emailEdit">
         <property name="toolTip">
          <string>Enter the email address</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -80,13 +89,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>firstNameEdit</tabstop>
   <tabstop>lastNameEdit</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -63,10 +63,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rxEdit">
+      <widget class="QLineEdit" name="rxEdit">
        <property name="toolTip">
         <string>Enter the regular expression to filter on</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -165,13 +168,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>categoryCombo</tabstop>
   <tabstop>rxEdit</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -144,10 +144,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rxEdit">
+      <widget class="QLineEdit" name="rxEdit">
        <property name="toolTip">
         <string>Enter the regular expression to filter on or search for</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
@@ -545,13 +548,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>actionsButton</tabstop>
   <tabstop>modeComboBox</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>352</height>
+    <height>436</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,10 +31,13 @@
        </widget>
       </item>
       <item row="0" column="1" colspan="2">
-       <widget class="E5ClearableLineEdit" name="defaultUrlEdit">
+       <widget class="QLineEdit" name="defaultUrlEdit">
         <property name="toolTip">
          <string>Enter the URL of the upstream repository</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -45,10 +48,13 @@
        </widget>
       </item>
       <item row="1" column="1" colspan="2">
-       <widget class="E5ClearableLineEdit" name="defaultUserEdit">
+       <widget class="QLineEdit" name="defaultUserEdit">
         <property name="toolTip">
          <string>Enter user name to acces the upstream repository</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -59,13 +65,16 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="defaultPasswordEdit">
+       <widget class="QLineEdit" name="defaultPasswordEdit">
         <property name="toolTip">
          <string>Enter the password to acces the upstream repository</string>
         </property>
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="2">
@@ -95,10 +104,13 @@
        </widget>
       </item>
       <item row="0" column="1" colspan="2">
-       <widget class="E5ClearableLineEdit" name="defaultPushUrlEdit">
+       <widget class="QLineEdit" name="defaultPushUrlEdit">
         <property name="toolTip">
          <string>Enter the URL of the upstream (push) repository</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -109,10 +121,13 @@
        </widget>
       </item>
       <item row="1" column="1" colspan="2">
-       <widget class="E5ClearableLineEdit" name="defaultPushUserEdit">
+       <widget class="QLineEdit" name="defaultPushUserEdit">
         <property name="toolTip">
          <string>Enter user name to acces the upstream (push) repository</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -123,13 +138,16 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="defaultPushPasswordEdit">
+       <widget class="QLineEdit" name="defaultPushPasswordEdit">
         <property name="toolTip">
          <string>Enter the password to acces the upstream (push) repository</string>
         </property>
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="2">
@@ -219,13 +237,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>defaultUrlEdit</tabstop>
   <tabstop>defaultUserEdit</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -53,13 +53,16 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="E5ClearableLineEdit" name="userNameEdit">
+           <widget class="QLineEdit" name="userNameEdit">
             <property name="toolTip">
              <string>Enter the user name</string>
             </property>
             <property name="placeholderText">
              <string>Enter your name</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -70,13 +73,16 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="E5ClearableLineEdit" name="emailEdit">
+           <widget class="QLineEdit" name="emailEdit">
             <property name="toolTip">
              <string>Enter the email address</string>
             </property>
             <property name="placeholderText">
              <string>Enter your email address</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -269,13 +275,16 @@
            </widget>
           </item>
           <item row="1" column="1" colspan="2">
-           <widget class="E5ClearableLineEdit" name="lfFilePatternsEdit">
+           <widget class="QLineEdit" name="lfFilePatternsEdit">
             <property name="toolTip">
              <string>Enter file patterns (space separated) for files to be treated as Large Files</string>
             </property>
             <property name="placeholderText">
              <string>Enter file patterns for large files</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -350,13 +359,16 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="E5ClearableLineEdit" name="proxyHostEdit">
+           <widget class="QLineEdit" name="proxyHostEdit">
             <property name="toolTip">
              <string>Enter the network proxy host name</string>
             </property>
             <property name="placeholderText">
              <string>Enter Proxy Hostname</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -367,13 +379,16 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="E5ClearableLineEdit" name="proxyUserEdit">
+           <widget class="QLineEdit" name="proxyUserEdit">
             <property name="toolTip">
              <string>Enter the user name for the network proxy</string>
             </property>
             <property name="placeholderText">
              <string>Enter Proxy Username</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -384,7 +399,7 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="E5ClearableLineEdit" name="proxyPasswordEdit">
+           <widget class="QLineEdit" name="proxyPasswordEdit">
             <property name="toolTip">
              <string>Enter the password for the network proxy</string>
             </property>
@@ -394,6 +409,9 @@
             <property name="placeholderText">
              <string>Enter Proxy Password</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -404,7 +422,7 @@
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="E5ClearableLineEdit" name="proxyBypassEdit">
+           <widget class="QLineEdit" name="proxyBypassEdit">
             <property name="toolTip">
              <string>Enter the names of hosts bypassing the network proxy sparated by comma</string>
             </property>
@@ -414,6 +432,9 @@
             <property name="placeholderText">
              <string>Enter hosts bypassing  the proxy separated by comma</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -657,11 +678,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5PathPicker</class>
    <extends>QWidget</extends>
    <header>E5Gui/E5PathPicker.h</header>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -25,13 +25,16 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5ClearableLineEdit" name="hostEdit">
+    <widget class="QLineEdit" name="hostEdit">
      <property name="toolTip">
       <string>Enter the host name</string>
      </property>
      <property name="placeholderText">
       <string>Enter Hostname</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -69,13 +72,16 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="E5ClearableLineEdit" name="fingerprintEdit">
+    <widget class="QLineEdit" name="fingerprintEdit">
      <property name="toolTip">
       <string>Enter the host fingerprint</string>
      </property>
      <property name="placeholderText">
       <string>Enter Fingerprint</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
@@ -90,13 +96,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>hostEdit</tabstop>
   <tabstop>hashComboBox</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -25,13 +25,16 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5ClearableLineEdit" name="hostEdit">
+    <widget class="QLineEdit" name="hostEdit">
      <property name="toolTip">
       <string>Enter the host name</string>
      </property>
      <property name="placeholderText">
       <string>Enter Hostname</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -73,13 +76,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>hostEdit</tabstop>
   <tabstop>minimumProtocolComboBox</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -73,10 +73,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rxEdit">
+      <widget class="QLineEdit" name="rxEdit">
        <property name="toolTip">
         <string>Enter the regular expression to filter on</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -319,13 +322,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>fromDate</tabstop>
   <tabstop>toDate</tabstop>

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -73,10 +73,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rxEdit">
+      <widget class="QLineEdit" name="rxEdit">
        <property name="toolTip">
         <string>Enter the regular expression to filter on</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -405,13 +408,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>fromDate</tabstop>
   <tabstop>toDate</tabstop>

--- a/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -66,7 +66,7 @@
         </widget>
        </item>
        <item row="0" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="typeEdit">
+        <widget class="QLineEdit" name="typeEdit">
          <property name="toolTip">
           <string>Enter the type</string>
          </property>
@@ -76,6 +76,9 @@
          <property name="placeholderText">
           <string>Mandatory</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -86,13 +89,16 @@
         </widget>
        </item>
        <item row="1" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="versionEdit">
+        <widget class="QLineEdit" name="versionEdit">
          <property name="toolTip">
           <string>Enter the version of the .desktop specification</string>
          </property>
          <property name="text">
           <string notr="true">1.0</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="2" column="0">
@@ -103,13 +109,16 @@
         </widget>
        </item>
        <item row="2" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="nameEdit">
+        <widget class="QLineEdit" name="nameEdit">
          <property name="toolTip">
           <string>Enter the application name</string>
          </property>
          <property name="placeholderText">
           <string>Mandatory</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="3" column="0">
@@ -120,10 +129,13 @@
         </widget>
        </item>
        <item row="3" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="genericNameEdit">
+        <widget class="QLineEdit" name="genericNameEdit">
          <property name="toolTip">
           <string>Enter the generic application name</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="4" column="0">
@@ -134,10 +146,13 @@
         </widget>
        </item>
        <item row="4" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="commentEdit">
+        <widget class="QLineEdit" name="commentEdit">
          <property name="toolTip">
           <string>Enter a comment</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="5" column="0">
@@ -148,10 +163,13 @@
         </widget>
        </item>
        <item row="5" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="iconFileEdit">
+        <widget class="QLineEdit" name="iconFileEdit">
          <property name="toolTip">
           <string>Enter the icon file name</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="6" column="0">
@@ -162,10 +180,13 @@
         </widget>
        </item>
        <item row="6" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="tryExecEdit">
+        <widget class="QLineEdit" name="tryExecEdit">
          <property name="toolTip">
           <string>Enter an executable command used to determine the application's presence</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="7" column="0">
@@ -176,10 +197,13 @@
         </widget>
        </item>
        <item row="7" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="execEdit">
+        <widget class="QLineEdit" name="execEdit">
          <property name="toolTip">
           <string>Enter the executable command</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="8" column="0">
@@ -190,10 +214,13 @@
         </widget>
        </item>
        <item row="8" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="pathEdit">
+        <widget class="QLineEdit" name="pathEdit">
          <property name="toolTip">
           <string>Enter the working directory</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="9" column="0">
@@ -234,10 +261,13 @@
         </widget>
        </item>
        <item row="10" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="mimetypeEdit">
+        <widget class="QLineEdit" name="mimetypeEdit">
          <property name="toolTip">
           <string>Enter the mime type</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="11" column="0">
@@ -248,10 +278,13 @@
         </widget>
        </item>
        <item row="11" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="categoriesEdit">
+        <widget class="QLineEdit" name="categoriesEdit">
          <property name="toolTip">
           <string>Enter the list of categories separated by ';'</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="11" column="3">
@@ -269,10 +302,13 @@
         </widget>
        </item>
        <item row="12" column="1" colspan="3">
-        <widget class="E5ClearableLineEdit" name="actionsEdit">
+        <widget class="QLineEdit" name="actionsEdit">
          <property name="toolTip">
           <string>Enter the list of actions separated by ';'</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="13" column="0">
@@ -283,13 +319,16 @@
         </widget>
        </item>
        <item row="13" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="onlyShowEdit">
+        <widget class="QLineEdit" name="onlyShowEdit">
          <property name="toolTip">
           <string>Enter the list of environments to show in separated by ';'</string>
          </property>
          <property name="placeholderText">
           <string>Only one of 'Only Show In' or 'Not Show In' allowed</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="13" column="3">
@@ -307,13 +346,16 @@
         </widget>
        </item>
        <item row="14" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="notShowEdit">
+        <widget class="QLineEdit" name="notShowEdit">
          <property name="toolTip">
           <string>Enter the list of environments to not show in separated by ';'</string>
          </property>
          <property name="placeholderText">
           <string>Only one of 'Only Show In' or 'Not Show In' allowed</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="14" column="3">
@@ -379,13 +421,16 @@
         </widget>
        </item>
        <item row="2" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeServiceTypeEdit">
+        <widget class="QLineEdit" name="kdeServiceTypeEdit">
          <property name="toolTip">
           <string>Enter the service type</string>
          </property>
          <property name="text">
           <string notr="true">Plasma/Applet</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="3" column="0">
@@ -396,10 +441,13 @@
         </widget>
        </item>
        <item row="3" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeMainScriptEdit">
+        <widget class="QLineEdit" name="kdeMainScriptEdit">
          <property name="toolTip">
           <string>Enter the main script name</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="4" column="0">
@@ -410,10 +458,13 @@
         </widget>
        </item>
        <item row="4" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeAuthorEdit">
+        <widget class="QLineEdit" name="kdeAuthorEdit">
          <property name="toolTip">
           <string>Enter the author's name</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="5" column="0">
@@ -424,10 +475,13 @@
         </widget>
        </item>
        <item row="5" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeEmailEdit">
+        <widget class="QLineEdit" name="kdeEmailEdit">
          <property name="toolTip">
           <string>Enter the auhor email</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="6" column="0">
@@ -438,10 +492,13 @@
         </widget>
        </item>
        <item row="6" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeNameEdit">
+        <widget class="QLineEdit" name="kdeNameEdit">
          <property name="toolTip">
           <string>Enter the application name</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="7" column="0">
@@ -452,10 +509,13 @@
         </widget>
        </item>
        <item row="7" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeVersionEdit">
+        <widget class="QLineEdit" name="kdeVersionEdit">
          <property name="toolTip">
           <string>Enter the version number in the form 'major.minor[.patch[.sub]]'</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="8" column="0">
@@ -466,10 +526,13 @@
         </widget>
        </item>
        <item row="8" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeWebsiteEdit">
+        <widget class="QLineEdit" name="kdeWebsiteEdit">
          <property name="toolTip">
           <string>Enter the URL of the website</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="9" column="0">
@@ -494,10 +557,13 @@
         </widget>
        </item>
        <item row="10" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeDependsEdit">
+        <widget class="QLineEdit" name="kdeDependsEdit">
          <property name="toolTip">
           <string>Enter the list of dependancies separated by ';'</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="11" column="0">
@@ -508,13 +574,16 @@
         </widget>
        </item>
        <item row="11" column="1" colspan="2">
-        <widget class="E5ClearableLineEdit" name="kdeLicensEdit">
+        <widget class="QLineEdit" name="kdeLicensEdit">
          <property name="toolTip">
           <string>Enter the license type</string>
          </property>
          <property name="text">
           <string notr="true">GPLv3</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="12" column="0">
@@ -575,13 +644,16 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="E5ClearableLineEdit" name="unityShortcutsEdit">
+        <widget class="QLineEdit" name="unityShortcutsEdit">
          <property name="toolTip">
           <string>Enter the desktop shortcuts separated by ';'</string>
          </property>
          <property name="text">
           <string notr="true">Next;Previous</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -640,13 +712,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>typeComboBox</tabstop>
   <tabstop>dataTabWidget</tabstop>

--- a/eric7/Preferences/ConfigurationDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Preferences/ConfigurationDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -17,11 +17,10 @@
 from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QTreeWidget, QStackedWidget, QDialog,
     QSplitter, QScrollArea, QApplication, QDialogButtonBox, QFrame,
-    QVBoxLayout, QTreeWidgetItem, QLabel, QAbstractScrollArea
+    QVBoxLayout, QTreeWidgetItem, QLabel, QAbstractScrollArea, QLineEdit
 )
 
 from E5Gui.E5Application import e5App
-from E5Gui.E5LineEdit import E5ClearableLineEdit
 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
 
@@ -508,9 +507,10 @@
         self.leftVBoxLayout.setContentsMargins(0, 0, 0, 0)
         self.leftVBoxLayout.setSpacing(0)
         self.leftVBoxLayout.setObjectName("leftVBoxLayout")
-        self.configListSearch = E5ClearableLineEdit(
+        self.configListSearch = QLineEdit(
             self, self.tr("Enter search text..."))
         self.configListSearch.setObjectName("configListSearch")
+        self.configListSearch.setClearButtonEnabled(True)
         self.leftVBoxLayout.addWidget(self.configListSearch)
         self.configList = QTreeWidget()
         self.configList.setObjectName("configList")

--- a/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui	Fri May 21 20:14:48 2021 +0200
@@ -194,7 +194,7 @@
             </widget>
            </item>
            <item>
-            <widget class="E5ClearableLineEdit" name="spellCheckTextFilesLineEdit">
+            <widget class="QLineEdit" name="spellCheckTextFilesLineEdit">
              <property name="toolTip">
               <string>Enter the file extensions of pure text files (separated by a space)</string>
              </property>
@@ -202,6 +202,9 @@
               <string>&lt;b&gt;Textfiles&lt;/b&gt;
 &lt;p&gt;Enter the file extension of pure text files. The complete contents of files with these extensions will be checked.&lt;/p&gt;</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>
@@ -401,11 +404,6 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>checkingEnabledCheckBox</tabstop>

--- a/eric7/Preferences/ConfigurationPages/MicroPythonPage.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MicroPythonPage.ui	Fri May 21 20:14:48 2021 +0200
@@ -266,10 +266,13 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="micropythonFirmwareUrlLineEdit">
+       <widget class="QLineEdit" name="micropythonFirmwareUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the MicroPython firmware for PyBoard, ESP8266 and ESP32</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -280,10 +283,13 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="E5ClearableLineEdit" name="micropythonDocuUrlLineEdit">
+       <widget class="QLineEdit" name="micropythonDocuUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the MicroPython documentation</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -303,10 +309,13 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="circuitpythonFirmwareUrlLineEdit">
+       <widget class="QLineEdit" name="circuitpythonFirmwareUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the CircuitPython firmware</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -317,13 +326,16 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="E5ClearableLineEdit" name="circuitpythonLibrariesUrlLineEdit">
+       <widget class="QLineEdit" name="circuitpythonLibrariesUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the CircuitPython libraries</string>
         </property>
         <property name="text">
          <string/>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -334,10 +346,13 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="circuitpythonDocuUrlLineEdit">
+       <widget class="QLineEdit" name="circuitpythonDocuUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the CircuitPython documentation</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -357,10 +372,13 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="microbitFirmwareUrlLineEdit">
+       <widget class="QLineEdit" name="microbitFirmwareUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the BBC micro:bit DAPLink Firmware</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2">
@@ -377,10 +395,13 @@
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="E5ClearableLineEdit" name="microbitV1MicroPythonUrlLineEdit">
+          <widget class="QLineEdit" name="microbitV1MicroPythonUrlLineEdit">
            <property name="toolTip">
             <string>Enter the URL for the BBC micro:bit V1 MicroPython Firmware</string>
            </property>
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item row="1" column="0">
@@ -391,10 +412,13 @@
           </widget>
          </item>
          <item row="1" column="1">
-          <widget class="E5ClearableLineEdit" name="microbitV2MicroPythonUrlLineEdit">
+          <widget class="QLineEdit" name="microbitV2MicroPythonUrlLineEdit">
            <property name="toolTip">
             <string>Enter the URL for the BBC micro:bit V2 MicroPython Firmware</string>
            </property>
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
         </layout>
@@ -408,10 +432,13 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="microbitDocuUrlLineEdit">
+       <widget class="QLineEdit" name="microbitDocuUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the BBC micro:bit MicroPython documentation</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -431,10 +458,13 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="calliopeFirmwareUrlLineEdit">
+       <widget class="QLineEdit" name="calliopeFirmwareUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the Callope mini Firmware</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -445,10 +475,13 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="E5ClearableLineEdit" name="calliopeMicroPythonUrlLineEdit">
+       <widget class="QLineEdit" name="calliopeMicroPythonUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the Calliope mini MicroPython Firmware</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -459,10 +492,13 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="E5ClearableLineEdit" name="calliopeDocuUrlLineEdit">
+       <widget class="QLineEdit" name="calliopeDocuUrlLineEdit">
         <property name="toolTip">
          <string>Enter the URL for the Calliope mini MicroPython documentation</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -490,11 +526,6 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>workspacePicker</tabstop>

--- a/eric7/Preferences/ShortcutsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Preferences/ShortcutsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -27,10 +27,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="searchEdit">
+      <widget class="QLineEdit" name="searchEdit">
        <property name="toolTip">
         <string>Enter the regular expression that should be contained in the shortcut action</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -124,13 +127,6 @@
   </layout>
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>actionButton</tabstop>

--- a/eric7/Preferences/SubstyleDefinitionDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Preferences/SubstyleDefinitionDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -34,10 +34,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="descriptionEdit">
+      <widget class="QLineEdit" name="descriptionEdit">
        <property name="toolTip">
         <string>Enter a short description for the style</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -92,13 +95,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>descriptionEdit</tabstop>
   <tabstop>wordsEdit</tabstop>

--- a/eric7/Project/CreateDialogCodeDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Project/CreateDialogCodeDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -83,10 +83,13 @@
       </widget>
      </item>
      <item row="2" column="1" colspan="2">
-      <widget class="E5ClearableLineEdit" name="filterEdit">
+      <widget class="QLineEdit" name="filterEdit">
        <property name="toolTip">
         <string>Enter a regular expression to filter the list below</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -110,13 +113,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>classNameCombo</tabstop>
   <tabstop>newButton</tabstop>

--- a/eric7/Project/MakePropertiesDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Project/MakePropertiesDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -71,10 +71,13 @@
     </widget>
    </item>
    <item>
-    <widget class="E5ClearableLineEdit" name="makeTargetEdit">
+    <widget class="QLineEdit" name="makeTargetEdit">
      <property name="toolTip">
       <string>Enter the make target to be built</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
@@ -88,10 +91,13 @@
     </widget>
    </item>
    <item>
-    <widget class="E5ClearableLineEdit" name="makeParametersEdit">
+    <widget class="QLineEdit" name="makeParametersEdit">
      <property name="toolTip">
       <string>Enter the command parameters for make</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
@@ -123,11 +129,6 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

--- a/eric7/Project/RccCompilerOptionsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Project/RccCompilerOptionsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -117,10 +117,13 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="rootEdit">
+      <widget class="QLineEdit" name="rootEdit">
        <property name="toolTip">
         <string>Enter the prefix for the resource access path</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -137,13 +140,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>thresholdSpinBox</tabstop>
   <tabstop>compressionSpinBox</tabstop>

--- a/eric7/Project/UicCompilerOptionsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/Project/UicCompilerOptionsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -24,10 +24,13 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <widget class="E5ClearableLineEdit" name="packageRootEdit">
+       <widget class="QLineEdit" name="packageRootEdit">
         <property name="toolTip">
          <string>Enter the project relative path of the packages root directory</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -40,10 +43,13 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="E5ClearableLineEdit" name="packageEdit">
+       <widget class="QLineEdit" name="packageEdit">
         <property name="toolTip">
          <string>Enter the package name</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -66,10 +72,13 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="E5ClearableLineEdit" name="suffixEdit">
+       <widget class="QLineEdit" name="suffixEdit">
         <property name="toolTip">
          <string>Enter the suffix of compiled resource files (default: _rc)</string>
         </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -97,13 +106,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>packageRootEdit</tabstop>
   <tabstop>packageEdit</tabstop>

--- a/eric7/QScintilla/SpellingDictionaryEditDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/QScintilla/SpellingDictionaryEditDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -56,7 +56,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="searchEdit">
+      <widget class="QLineEdit" name="searchEdit">
        <property name="minimumSize">
         <size>
          <width>300</width>
@@ -69,6 +69,9 @@
        <property name="placeholderText">
         <string>Enter search term</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -160,11 +163,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5ListView</class>
    <extends>QListView</extends>
    <header>E5Gui/E5ListView.h</header>

--- a/eric7/VirtualEnv/VirtualenvAddEditDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvAddEditDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -22,7 +22,11 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="E5ClearableLineEdit" name="execPathEdit"/>
+    <widget class="QLineEdit" name="execPathEdit">
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -118,10 +122,13 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5ClearableLineEdit" name="nameEdit">
+    <widget class="QLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter a unique name for the virtual environment</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
@@ -154,11 +161,6 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>nameEdit</tabstop>

--- a/eric7/VirtualEnv/VirtualenvConfigurationDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvConfigurationDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -97,13 +97,16 @@
       </widget>
      </item>
      <item>
-      <widget class="E5ClearableLineEdit" name="nameEdit">
+      <widget class="QLineEdit" name="nameEdit">
        <property name="toolTip">
         <string>Enter a unique name for the virtual environment</string>
        </property>
        <property name="placeholderText">
         <string>Name for the virtual environment</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
@@ -187,13 +190,16 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="E5ClearableLineEdit" name="promptPrefixEdit">
+           <widget class="QLineEdit" name="promptPrefixEdit">
             <property name="toolTip">
              <string>Enter the prompt prefix for the virtual environment</string>
             </property>
             <property name="placeholderText">
              <string>Prompt prefix for the virtual environment</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -469,10 +475,13 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="E5ClearableLineEdit" name="condaNameEdit">
+           <widget class="QLineEdit" name="condaNameEdit">
             <property name="toolTip">
              <string>Enter the name for the environment</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -560,10 +569,13 @@
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="E5ClearableLineEdit" name="condaCloneNameEdit">
+              <widget class="QLineEdit" name="condaCloneNameEdit">
                <property name="toolTip">
                 <string>Enter the name of the environment to be cloned</string>
                </property>
+               <property name="clearButtonEnabled">
+                <bool>true</bool>
+               </property>
               </widget>
              </item>
              <item row="1" column="0">
@@ -646,10 +658,13 @@
           </widget>
          </item>
          <item>
-          <widget class="E5ClearableLineEdit" name="condaPackagesEdit">
+          <widget class="QLineEdit" name="condaPackagesEdit">
            <property name="toolTip">
             <string>Enter the package specifications for the environment</string>
            </property>
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
         </layout>
@@ -668,10 +683,13 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="E5ClearableLineEdit" name="condaPythonEdit">
+           <widget class="QLineEdit" name="condaPythonEdit">
             <property name="toolTip">
              <string>Enter the Python version for the environment</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
@@ -725,11 +743,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5PathPicker</class>
    <extends>QWidget</extends>
    <header>E5Gui/E5PathPicker.h</header>

--- a/eric7/VirtualEnv/VirtualenvNameDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvNameDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -41,13 +41,16 @@
     </widget>
    </item>
    <item>
-    <widget class="E5ClearableLineEdit" name="nameEdit">
+    <widget class="QLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter a unique name for the virtual environment</string>
      </property>
      <property name="placeholderText">
       <string>Name for the virtual environment</string>
      </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
@@ -62,13 +65,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>envsList</tabstop>
   <tabstop>nameEdit</tabstop>

--- a/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -45,8 +45,6 @@
         self.useLimitedEasyListCheckBox.setChecked(Preferences.getWebBrowser(
             "AdBlockUseLimitedEasyList"))
         
-        self.searchEdit.setInactiveText(self.tr("Search..."))
-        
         self.adBlockGroup.setChecked(self.__manager.isEnabled())
         self.__manager.requiredSubscriptionLoaded.connect(self.addSubscription)
         self.__manager.enabledChanged.connect(self.__managerEnabledChanged)

--- a/eric7/WebBrowser/AdBlock/AdBlockDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -58,10 +58,16 @@
          </spacer>
         </item>
         <item row="1" column="1">
-         <widget class="E5ClearableLineEdit" name="searchEdit">
+         <widget class="QLineEdit" name="searchEdit">
           <property name="toolTip">
            <string>Enter search term for subscriptions and rules</string>
           </property>
+          <property name="placeholderText">
+           <string>Search...</string>
+          </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -151,13 +157,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>adBlockGroup</tabstop>
   <tabstop>searchEdit</tabstop>

--- a/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -33,8 +33,6 @@
         self.iconLabel.setPixmap(
             UI.PixmapCache.getPixmap("adBlockPlusGreen48"))
         
-        self.hostEdit.setInactiveText(self.tr("Enter host to be added..."))
-        
         self.buttonBox.setFocus()
     
     def load(self, hosts):

--- a/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -46,10 +46,16 @@
       </spacer>
      </item>
      <item row="1" column="1">
-      <widget class="E5ClearableLineEdit" name="hostEdit">
+      <widget class="QLineEdit" name="hostEdit">
        <property name="toolTip">
         <string>Enter a host to block AdBlock for</string>
        </property>
+       <property name="placeholderText">
+        <string>Enter host to be added...</string>
+       </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="1" column="2">
@@ -115,13 +121,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>hostEdit</tabstop>
   <tabstop>addButton</tabstop>

--- a/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py	Fri May 21 20:14:48 2021 +0200
@@ -110,9 +110,6 @@
         self.locationCombo.setModel(self.__proxyModel)
         self.locationCombo.setView(self.__treeView)
         
-        self.addressEdit.setInactiveText(self.tr("Url"))
-        self.nameEdit.setInactiveText(self.tr("Title"))
-        
         self.resize(self.sizeHint())
     
     def setUrl(self, url):

--- a/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -37,10 +37,16 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5LineEdit" name="nameEdit">
+    <widget class="QLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter the name</string>
      </property>
+     <property name="placeholderText">
+      <string>Bookmark Title</string>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -51,10 +57,16 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="E5LineEdit" name="addressEdit">
+    <widget class="QLineEdit" name="addressEdit">
      <property name="toolTip">
       <string>Enter the address</string>
      </property>
+     <property name="placeholderText">
+      <string>Bookmark URL</string>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
@@ -96,13 +108,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5LineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>nameEdit</tabstop>
   <tabstop>addressEdit</tabstop>

--- a/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -37,7 +37,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="E5LineEdit" name="nameEdit">
+    <widget class="QLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter the name</string>
      </property>
@@ -51,7 +51,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="E5LineEdit" name="addressEdit">
+    <widget class="QLineEdit" name="addressEdit">
      <property name="toolTip">
       <string>Enter the address</string>
      </property>
@@ -93,13 +93,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5LineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>nameEdit</tabstop>
   <tabstop>addressEdit</tabstop>

--- a/eric7/WebBrowser/Bookmarks/BookmarksDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,10 +38,13 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="toolTip">
           <string>Enter search term for bookmarks</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -121,11 +124,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TreeView</class>
    <extends>QTreeView</extends>
    <header>E5Gui/E5TreeView.h</header>

--- a/eric7/WebBrowser/CookieJar/CookiesDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookiesDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,7 +38,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="minimumSize">
           <size>
            <width>300</width>
@@ -51,6 +51,9 @@
          <property name="placeholderText">
           <string>Search</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -303,11 +306,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5SqueezeLabel</class>
    <extends>QLabel</extends>
    <header>E5Gui/E5SqueezeLabels.h</header>

--- a/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -139,7 +139,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="E5ClearableLineEdit" name="searchEdit">
+           <widget class="QLineEdit" name="searchEdit">
             <property name="minimumSize">
              <size>
               <width>300</width>
@@ -149,6 +149,9 @@
             <property name="toolTip">
              <string>Enter search term for exceptions</string>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -233,11 +236,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TableView</class>
    <extends>QTableView</extends>
    <header>E5Gui/E5TableView.h</header>

--- a/eric7/WebBrowser/History/HistoryDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,10 +38,13 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="toolTip">
           <string>Enter search term for history entries</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -121,11 +124,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TreeView</class>
    <extends>QTreeView</extends>
    <header>E5Gui/E5TreeView.h</header>

--- a/eric7/WebBrowser/Network/SendRefererWhitelistDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Network/SendRefererWhitelistDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -23,7 +23,7 @@
       <number>0</number>
      </property>
      <item row="0" column="1">
-      <widget class="E5ClearableLineEdit" name="searchEdit">
+      <widget class="QLineEdit" name="searchEdit">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -39,6 +39,9 @@
        <property name="toolTip">
         <string>Enter search term for hosts</string>
        </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="0" column="0">
@@ -143,11 +146,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5ListView</class>
    <extends>QListView</extends>
    <header>E5Gui/E5ListView.h</header>

--- a/eric7/WebBrowser/Passwords/PasswordsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,7 +38,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -54,6 +54,9 @@
          <property name="toolTip">
           <string>Enter search term</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -146,11 +149,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TableView</class>
    <extends>QTableView</extends>
    <header>E5Gui/E5TableView.h</header>

--- a/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>400</height>
+    <height>412</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -93,7 +93,11 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="firstnameEdit"/>
+      <widget class="QLineEdit" name="firstnameEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="0" column="2">
       <widget class="QLabel" name="label_08">
@@ -106,7 +110,11 @@
       </widget>
      </item>
      <item row="0" column="3">
-      <widget class="QLineEdit" name="zipEdit"/>
+      <widget class="QLineEdit" name="zipEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_03">
@@ -119,7 +127,11 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lastnameEdit"/>
+      <widget class="QLineEdit" name="lastnameEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="1" column="2">
       <widget class="QLabel" name="label_09">
@@ -132,7 +144,11 @@
       </widget>
      </item>
      <item row="1" column="3">
-      <widget class="QLineEdit" name="stateEdit"/>
+      <widget class="QLineEdit" name="stateEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_18">
@@ -145,7 +161,11 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QLineEdit" name="fullnameEdit"/>
+      <widget class="QLineEdit" name="fullnameEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="2" column="2">
       <widget class="QLabel" name="label_10">
@@ -158,7 +178,11 @@
       </widget>
      </item>
      <item row="2" column="3">
-      <widget class="QLineEdit" name="countryEdit"/>
+      <widget class="QLineEdit" name="countryEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_12">
@@ -171,7 +195,11 @@
       </widget>
      </item>
      <item row="3" column="1">
-      <widget class="QLineEdit" name="emailEdit"/>
+      <widget class="QLineEdit" name="emailEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="3" column="2">
       <widget class="QLabel" name="label_11">
@@ -184,7 +212,11 @@
       </widget>
      </item>
      <item row="3" column="3">
-      <widget class="QLineEdit" name="homepageEdit"/>
+      <widget class="QLineEdit" name="homepageEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label_04">
@@ -197,7 +229,11 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="QLineEdit" name="phoneEdit"/>
+      <widget class="QLineEdit" name="phoneEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="4" column="2">
       <widget class="QLabel" name="label_13">
@@ -210,7 +246,11 @@
       </widget>
      </item>
      <item row="4" column="3">
-      <widget class="QLineEdit" name="special1Edit"/>
+      <widget class="QLineEdit" name="special1Edit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="5" column="0">
       <widget class="QLabel" name="label_05">
@@ -223,7 +263,11 @@
       </widget>
      </item>
      <item row="5" column="1">
-      <widget class="QLineEdit" name="mobileEdit"/>
+      <widget class="QLineEdit" name="mobileEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="5" column="2">
       <widget class="QLabel" name="label_14">
@@ -236,7 +280,11 @@
       </widget>
      </item>
      <item row="5" column="3">
-      <widget class="QLineEdit" name="special2Edit"/>
+      <widget class="QLineEdit" name="special2Edit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="6" column="0">
       <widget class="QLabel" name="label_06">
@@ -249,7 +297,11 @@
       </widget>
      </item>
      <item row="6" column="1">
-      <widget class="QLineEdit" name="addressEdit"/>
+      <widget class="QLineEdit" name="addressEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="6" column="2">
       <widget class="QLabel" name="label_15">
@@ -262,7 +314,11 @@
       </widget>
      </item>
      <item row="6" column="3">
-      <widget class="QLineEdit" name="special3Edit"/>
+      <widget class="QLineEdit" name="special3Edit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="7" column="0">
       <widget class="QLabel" name="label_07">
@@ -275,7 +331,11 @@
       </widget>
      </item>
      <item row="7" column="1">
-      <widget class="QLineEdit" name="cityEdit"/>
+      <widget class="QLineEdit" name="cityEdit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="7" column="2">
       <widget class="QLabel" name="label_17">
@@ -288,7 +348,11 @@
       </widget>
      </item>
      <item row="7" column="3">
-      <widget class="QLineEdit" name="special4Edit"/>
+      <widget class="QLineEdit" name="special4Edit">
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>

--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>565</height>
+    <height>597</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -120,6 +120,9 @@
           <property name="toolTip">
            <string>Enter the Google Safe Browsing API key</string>
           </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -275,7 +278,11 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="E5ClearableLineEdit" name="urlEdit"/>
+       <widget class="QLineEdit" name="urlEdit">
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
       <item row="1" column="0" colspan="2">
        <widget class="QPushButton" name="urlCheckButton">
@@ -305,13 +312,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>gsbGroupBox</tabstop>
   <tabstop>gsbFilterPlatformCheckBox</tabstop>

--- a/eric7/WebBrowser/UrlBar/UrlBar.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/UrlBar.py	Fri May 21 20:14:48 2021 +0200
@@ -43,7 +43,7 @@
         @param parent reference to the parent widget (WebBrowserView)
         """
         E5LineEdit.__init__(self, parent)
-        self.setInactiveText(self.tr("Enter the URL here."))
+        self.setPlaceholderText(self.tr("Enter the URL here."))
         self.setWhatsThis(self.tr("Enter the URL here."))
         
         self.__mw = mainWindow

--- a/eric7/WebBrowser/UserAgent/UserAgentsDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentsDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,10 +38,13 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="toolTip">
           <string>Enter search term</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -124,11 +127,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TableView</class>
    <extends>QTableView</extends>
    <header>E5Gui/E5TableView.h</header>

--- a/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Fri May 21 20:14:48 2021 +0200
@@ -385,7 +385,7 @@
         if self.__suggestionsEnabled:
             newEngine.suggestions.connect(self.__newSuggestions)
         
-        self.setInactiveText(self.__openSearchManager.currentEngineName())
+        self.setPlaceholderText(self.__openSearchManager.currentEngineName())
         self.__currentEngine = self.__openSearchManager.currentEngineName()
         self.__engineButton.setIcon(QIcon(QPixmap.fromImage(
             self.__openSearchManager.currentEngine().image())))

--- a/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.ui	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.ui	Fri May 21 20:14:48 2021 +0200
@@ -38,7 +38,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="E5ClearableLineEdit" name="searchEdit">
+        <widget class="QLineEdit" name="searchEdit">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -54,6 +54,9 @@
          <property name="toolTip">
           <string>Enter search term</string>
          </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -136,11 +139,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ClearableLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>E5Gui/E5LineEdit.h</header>
-  </customwidget>
-  <customwidget>
    <class>E5TableView</class>
    <extends>QTableView</extends>
    <header>E5Gui/E5TableView.h</header>