Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.

Tue, 02 Mar 2021 17:17:09 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 02 Mar 2021 17:17:09 +0100
changeset 8143
2c730d5fd177
parent 8141
27f636beebad
child 8144
46082367138c

Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.

eric6/CondaInterface/Conda.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaExecDialog.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaExportDialog.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaInfoDialog.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaNewEnvironmentDataDialog.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaPackageDetailsWidget.py file | annotate | diff | comparison | revisions
eric6/CondaInterface/CondaPackagesWidget.py file | annotate | diff | comparison | revisions
eric6/Cooperation/ChatWidget.py file | annotate | diff | comparison | revisions
eric6/Cooperation/ChatWidget.ui file | annotate | diff | comparison | revisions
eric6/Cooperation/CooperationClient.py file | annotate | diff | comparison | revisions
eric6/DataViews/CodeMetricsDialog.py file | annotate | diff | comparison | revisions
eric6/DataViews/PyCoverageDialog.py file | annotate | diff | comparison | revisions
eric6/DataViews/PyProfileDialog.py file | annotate | diff | comparison | revisions
eric6/DebugClients/Python/QProcessExtension.py file | annotate | diff | comparison | revisions
eric6/Debugger/BreakPointModel.py file | annotate | diff | comparison | revisions
eric6/Debugger/BreakPointViewer.py file | annotate | diff | comparison | revisions
eric6/Debugger/CallStackViewer.py file | annotate | diff | comparison | revisions
eric6/Debugger/CallTraceViewer.py file | annotate | diff | comparison | revisions
eric6/Debugger/DebugServer.py file | annotate | diff | comparison | revisions
eric6/Debugger/DebugUI.py file | annotate | diff | comparison | revisions
eric6/Debugger/DebugViewer.py file | annotate | diff | comparison | revisions
eric6/Debugger/EditBreakpointDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/EditBreakpointDialog.ui file | annotate | diff | comparison | revisions
eric6/Debugger/EditWatchpointDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/ExceptionLogger.py file | annotate | diff | comparison | revisions
eric6/Debugger/ExceptionsFilterDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/StartCoverageDialog.ui file | annotate | diff | comparison | revisions
eric6/Debugger/StartDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/StartHistoryEditDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/VariablesFilterDialog.py file | annotate | diff | comparison | revisions
eric6/Debugger/VariablesViewer.py file | annotate | diff | comparison | revisions
eric6/Debugger/WatchPointModel.py file | annotate | diff | comparison | revisions
eric6/Debugger/WatchPointViewer.py file | annotate | diff | comparison | revisions
eric6/E5Graphics/E5ArrowItem.py file | annotate | diff | comparison | revisions
eric6/E5Graphics/E5GraphicsView.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5Action.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5AnimatedWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5Application.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ClickableLabel.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ComboSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5Completers.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ErrorMessage.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5FileDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5FileSaveConfirmDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5GenericDiffHighlighter.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5Led.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5LineEdit.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5LineEditButton.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ListSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ListView.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5MapWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5MessageBox.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ModelMenu.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ModelToolBar.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5OverrideCursor.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5PassivePopup.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5PathPicker.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5PathPickerDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5PlainTextDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ProcessDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5SideBar.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5SimpleHelpDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5SqueezeLabels.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5StringListEditWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TabWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TableView.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TextEditSearchWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TextInputDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ToolBarDialog.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ToolBarManager.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ToolBox.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ToolButton.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TreeSortFilterProxyModel.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TreeView.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TreeWidget.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5GoogleMail.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5NetworkHeaderDetailsDialog.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5NetworkProxyFactory.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5SslCertificateSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5SslCertificatesDialog.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5SslCertificatesInfoWidget.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5SslErrorHandler.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5SslInfoWidget.py file | annotate | diff | comparison | revisions
eric6/E5Network/E5XmlRpcClient.py file | annotate | diff | comparison | revisions
eric6/E5Network/__init__.py file | annotate | diff | comparison | revisions
eric6/Graphics/AssociationItem.py file | annotate | diff | comparison | revisions
eric6/Graphics/ClassItem.py file | annotate | diff | comparison | revisions
eric6/Graphics/ModuleItem.py file | annotate | diff | comparison | revisions
eric6/Graphics/PackageItem.py file | annotate | diff | comparison | revisions
eric6/Graphics/PixmapDiagram.py file | annotate | diff | comparison | revisions
eric6/Graphics/SvgDiagram.py file | annotate | diff | comparison | revisions
eric6/Graphics/UMLDialog.py file | annotate | diff | comparison | revisions
eric6/Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
eric6/Graphics/UMLItem.py file | annotate | diff | comparison | revisions
eric6/HexEdit/HexEditChunks.py file | annotate | diff | comparison | revisions
eric6/HexEdit/HexEditGotoWidget.py file | annotate | diff | comparison | revisions
eric6/HexEdit/HexEditMainWindow.py file | annotate | diff | comparison | revisions
eric6/HexEdit/HexEditSearchReplaceWidget.py file | annotate | diff | comparison | revisions
eric6/HexEdit/HexEditWidget.py file | annotate | diff | comparison | revisions
eric6/IconEditor/IconEditorGrid.py file | annotate | diff | comparison | revisions
eric6/IconEditor/IconEditorPalette.py file | annotate | diff | comparison | revisions
eric6/IconEditor/IconEditorWindow.py file | annotate | diff | comparison | revisions
eric6/MicroPython/AddEditDevicesDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/ConnectionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/EspBackupRestoreFirmwareDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/EspDevices.py file | annotate | diff | comparison | revisions
eric6/MicroPython/EspFirmwareSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonCommandsInterface.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonFileManagerWidget.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonGraphWidget.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonProgressInfoDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonSerialPort.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicroPythonWidget.py file | annotate | diff | comparison | revisions
eric6/MicroPython/MicrobitDevices.py file | annotate | diff | comparison | revisions
eric6/MicroPython/PyBoardDevices.py file | annotate | diff | comparison | revisions
eric6/MicroPython/UF2FlashDialog.py file | annotate | diff | comparison | revisions
eric6/MicroPython/UnknownDevicesDialog.py file | annotate | diff | comparison | revisions
eric6/MultiProject/AddProjectDialog.py file | annotate | diff | comparison | revisions
eric6/MultiProject/MultiProject.py file | annotate | diff | comparison | revisions
eric6/MultiProject/MultiProjectBrowser.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcChannelEditDialog.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcChannelWidget.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcIdentitiesEditDialog.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcMessageEdit.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcNetworkEditDialog.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcNetworkListDialog.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcNetworkWidget.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcServerEditDialog.py file | annotate | diff | comparison | revisions
eric6/Network/IRC/IrcWidget.py file | annotate | diff | comparison | revisions
eric6/PipInterface/Pip.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipDialog.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipFileSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipFreezeDialog.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipPackageDetailsDialog.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipPackagesInputDialog.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipPackagesWidget.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginDetailsDialog.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginInfoDialog.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginInstallDialog.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
eric6/PluginManager/PluginUninstallDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/AboutPlugin/AboutDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginAbout.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginEricapi.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginEricdoc.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginTranslator.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardDotDesktop.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardE5MessageBox.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardEricPlugin.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardPyRegExp.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQColorDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQFileDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQFontDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQInputDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQMessageBox.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQRegularExpression.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardSetup.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/Translator.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py file | annotate | diff | comparison | revisions
eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitBundleDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitPullDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitPushDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/GitTagDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsGit/git.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/ConfigurationPageBase.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/CooperationPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/DiffColoursPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorCalltipsPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorFilePage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorGeneralPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorHighlightersPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorStylesPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/HexEditorPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/IconsPreviewDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/MicroPythonPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/SecurityPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/ShellPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/TemplatesPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/WebBrowserPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/MouseClickDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ProgramsDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ShortcutDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/Shortcuts.py file | annotate | diff | comparison | revisions
eric6/Preferences/ShortcutsDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/SubstyleDefinitionDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ToolConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ToolGroupConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/__init__.py file | annotate | diff | comparison | revisions
eric6/Project/AddFoundFilesDialog.py file | annotate | diff | comparison | revisions
eric6/Project/CreateDialogCodeDialog.py file | annotate | diff | comparison | revisions
eric6/Project/DebuggerPropertiesDialog.py file | annotate | diff | comparison | revisions
eric6/Project/FiletypeAssociationDialog.py file | annotate | diff | comparison | revisions
eric6/Project/IdlCompilerDefineNameDialog.py file | annotate | diff | comparison | revisions
eric6/Project/IdlCompilerOptionsDialog.py file | annotate | diff | comparison | revisions
eric6/Project/LexerAssociationDialog.py file | annotate | diff | comparison | revisions
eric6/Project/MakePropertiesDialog.py file | annotate | diff | comparison | revisions
eric6/Project/NewDialogClassDialog.py file | annotate | diff | comparison | revisions
eric6/Project/NewPythonPackageDialog.py file | annotate | diff | comparison | revisions
eric6/Project/Project.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectBaseBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectBrowserModel.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectFormsBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectInterfacesBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectOthersBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectProtocolsBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectResourcesBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectSourcesBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/ProjectTranslationsBrowser.py file | annotate | diff | comparison | revisions
eric6/Project/PropertiesDialog.py file | annotate | diff | comparison | revisions
eric6/Project/QuickFindFileDialog.py file | annotate | diff | comparison | revisions
eric6/Project/TranslationPropertiesDialog.py file | annotate | diff | comparison | revisions
eric6/Project/UicLoadUi5.py file | annotate | diff | comparison | revisions
eric6/PyUnit/UnittestDialog.py file | annotate | diff | comparison | revisions
eric6/QScintilla/APIsManager.py file | annotate | diff | comparison | revisions
eric6/QScintilla/DocstringGenerator/BaseDocstringGenerator.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric6/QScintilla/EditorButtonsWidget.py file | annotate | diff | comparison | revisions
eric6/QScintilla/EditorOutline.py file | annotate | diff | comparison | revisions
eric6/QScintilla/KeySequenceTranslator.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MarkupProviders/HtmlProvider.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MarkupProviders/ImageMarkupDialog.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MarkupProviders/MarkdownProvider.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MarkupProviders/RestructuredTextProvider.py file | annotate | diff | comparison | revisions
eric6/QScintilla/MiniEditor.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Printer.py file | annotate | diff | comparison | revisions
eric6/QScintilla/QsciScintillaCompat.py file | annotate | diff | comparison | revisions
eric6/QScintilla/SearchReplaceWidget.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Shell.py file | annotate | diff | comparison | revisions
eric6/QScintilla/ShellHistoryDialog.py file | annotate | diff | comparison | revisions
eric6/QScintilla/ShellWindow.py file | annotate | diff | comparison | revisions
eric6/QScintilla/SpellingDictionaryEditDialog.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapWidget.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotDefaultGrabber.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotFreehandGrabber.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotPreview.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotRegionGrabber.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotTimer.py file | annotate | diff | comparison | revisions
eric6/Snapshot/SnapshotWaylandGrabber.py file | annotate | diff | comparison | revisions
eric6/SqlBrowser/SqlBrowser.py file | annotate | diff | comparison | revisions
eric6/SqlBrowser/SqlBrowserWidget.py file | annotate | diff | comparison | revisions
eric6/SqlBrowser/SqlConnectionDialog.py file | annotate | diff | comparison | revisions
eric6/SqlBrowser/SqlConnectionWidget.py file | annotate | diff | comparison | revisions
eric6/Tasks/Task.py file | annotate | diff | comparison | revisions
eric6/Tasks/TaskViewer.py file | annotate | diff | comparison | revisions
eric6/Templates/TemplateMultipleVariablesDialog.py file | annotate | diff | comparison | revisions
eric6/Templates/TemplatePropertiesDialog.py file | annotate | diff | comparison | revisions
eric6/Templates/TemplateViewer.py file | annotate | diff | comparison | revisions
eric6/Toolbox/SingleApplication.py file | annotate | diff | comparison | revisions
eric6/Toolbox/Startup.py file | annotate | diff | comparison | revisions
eric6/Tools/TRPreviewer.py file | annotate | diff | comparison | revisions
eric6/Tools/TrayStarter.py file | annotate | diff | comparison | revisions
eric6/Tools/UIPreviewer.py file | annotate | diff | comparison | revisions
eric6/UI/AuthenticationDialog.py file | annotate | diff | comparison | revisions
eric6/UI/Browser.py file | annotate | diff | comparison | revisions
eric6/UI/BrowserModel.py file | annotate | diff | comparison | revisions
eric6/UI/CodeDocumentationViewer.py file | annotate | diff | comparison | revisions
eric6/UI/CompareDialog.py file | annotate | diff | comparison | revisions
eric6/UI/DeleteFilesConfirmationDialog.py file | annotate | diff | comparison | revisions
eric6/UI/DiffDialog.py file | annotate | diff | comparison | revisions
eric6/UI/EmailDialog.py file | annotate | diff | comparison | revisions
eric6/UI/ErrorLogDialog.py file | annotate | diff | comparison | revisions
eric6/UI/FindFileDialog.py file | annotate | diff | comparison | revisions
eric6/UI/FindFileNameDialog.py file | annotate | diff | comparison | revisions
eric6/UI/InstallInfoDialog.py file | annotate | diff | comparison | revisions
eric6/UI/LogView.py file | annotate | diff | comparison | revisions
eric6/UI/NotificationWidget.py file | annotate | diff | comparison | revisions
eric6/UI/NumbersWidget.py file | annotate | diff | comparison | revisions
eric6/UI/PixmapCache.py file | annotate | diff | comparison | revisions
eric6/UI/Previewers/PreviewerHTML.py file | annotate | diff | comparison | revisions
eric6/UI/Previewers/PreviewerQSS.py file | annotate | diff | comparison | revisions
eric6/UI/PythonAstViewer.py file | annotate | diff | comparison | revisions
eric6/UI/PythonDisViewer.py file | annotate | diff | comparison | revisions
eric6/UI/SearchWidget.py file | annotate | diff | comparison | revisions
eric6/UI/SplashScreen.py file | annotate | diff | comparison | revisions
eric6/UI/SymbolsWidget.py file | annotate | diff | comparison | revisions
eric6/UI/UserInterface.py file | annotate | diff | comparison | revisions
eric6/Utilities/BackgroundService.py file | annotate | diff | comparison | revisions
eric6/Utilities/MouseUtilities.py file | annotate | diff | comparison | revisions
eric6/Utilities/__init__.py file | annotate | diff | comparison | revisions
eric6/Utilities/crypto/__init__.py file | annotate | diff | comparison | revisions
eric6/VCS/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
eric6/VCS/ProjectHelper.py file | annotate | diff | comparison | revisions
eric6/VCS/StatusMonitorLed.py file | annotate | diff | comparison | revisions
eric6/VCS/VersionControl.py file | annotate | diff | comparison | revisions
eric6/ViewManager/BookmarkedFilesDialog.py file | annotate | diff | comparison | revisions
eric6/ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvAddEditDialog.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvExecDialog.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvInterpreterSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvManager.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvManagerDialog.py file | annotate | diff | comparison | revisions
eric6/VirtualEnv/VirtualenvNameDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockExceptionsDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockIcon.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockRule.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockSubscription.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/AutoScroll/AutoScroller.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImportDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksMenu.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/BookmarksToolBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/XbelReader.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Bookmarks/XbelWriter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/CookieJar/CookieExceptionsModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/CookieJar/CookieJar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/CookieJar/CookiesDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadItem.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadManagerButton.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/FeaturePermissions/FeaturePermissionBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Feeds/FeedEditDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Feeds/FeedsDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Feeds/FeedsManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryCompleter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryFilterModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryMenu.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/History/HistoryTreeModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Navigation/NavigationBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Navigation/NavigationContainer.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Navigation/ReloadStopButton.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/EricSchemeHandler.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/NetworkManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/NetworkUrlInterceptor.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/ProtocolHandlerManagerDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/QtHelpSchemeHandler.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/SendRefererWhitelistDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/SslErrorExceptionsDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchEngine.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchEngineModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchReader.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/OpenSearch/OpenSearchWriter.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/PageScreenDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Passwords/PasswordManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Passwords/PasswordModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/PersonalInformationManager/PersonalInformationManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/HelpDocsInstaller.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/HelpIndexWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/HelpSearchWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/HelpTocWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/QtHelpDocumentationDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SafeBrowsing/SafeBrowsingCache.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SearchWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Session/SessionManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Session/SessionManagerDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SiteInfo/SiteInfoDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SiteInfo/SiteInfoWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SpeedDial/PageThumbnailer.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SpeedDial/SpeedDial.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/SpellCheck/ManageDictionariesDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/StatusBar/ImagesIcon.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/StatusBar/JavaScriptIcon.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Sync/SyncAssistantDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/TabManager/TabManagerWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/PrintToPdfDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/Scripts.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/WebBrowserTools.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/WebHitTestResult.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/WebIconDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Tools/WebIconProvider.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UrlBar/FavIconLabel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UrlBar/SslLabel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UrlBar/StackedUrlBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UrlBar/UrlBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UserAgent/UserAgentManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UserAgent/UserAgentMenu.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/UserAgent/UserAgentModel.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/VirusTotal/VirusTotalApi.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserJavaScriptConsole.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserLanguagesDialog.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserPage.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserSnap.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserTabBar.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserTabWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserWebSearchWidget.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserWindow.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebInspector.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/ZoomManager/ZoomValuesModel.py file | annotate | diff | comparison | revisions
eric6/eric6.py file | annotate | diff | comparison | revisions
eric6/eric6_browser.py file | annotate | diff | comparison | revisions
eric6/eric6_compare.py file | annotate | diff | comparison | revisions
eric6/eric6_configure.py file | annotate | diff | comparison | revisions
eric6/eric6_diff.py file | annotate | diff | comparison | revisions
eric6/eric6_editor.py file | annotate | diff | comparison | revisions
eric6/eric6_hexeditor.py file | annotate | diff | comparison | revisions
eric6/eric6_iconeditor.py file | annotate | diff | comparison | revisions
eric6/eric6_plugininstall.py file | annotate | diff | comparison | revisions
eric6/eric6_pluginrepository.py file | annotate | diff | comparison | revisions
eric6/eric6_pluginuninstall.py file | annotate | diff | comparison | revisions
eric6/eric6_qregularexpression.py file | annotate | diff | comparison | revisions
eric6/eric6_re.py file | annotate | diff | comparison | revisions
eric6/eric6_shell.py file | annotate | diff | comparison | revisions
eric6/eric6_snap.py file | annotate | diff | comparison | revisions
eric6/eric6_sqlbrowser.py file | annotate | diff | comparison | revisions
eric6/eric6_tray.py file | annotate | diff | comparison | revisions
eric6/eric6_trpreviewer.py file | annotate | diff | comparison | revisions
eric6/eric6_uipreviewer.py file | annotate | diff | comparison | revisions
eric6/eric6_unittest.py file | annotate | diff | comparison | revisions
--- a/eric6/CondaInterface/Conda.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/Conda.py	Tue Mar 02 17:17:09 2021 +0100
@@ -510,7 +510,7 @@
                     "Do you really want to uninstall these packages and"
                     " their dependencies?"),
                 packages)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 args = [
                     "remove",
                     "--json",
--- a/eric6/CondaInterface/CondaExecDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaExecDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -36,8 +36,10 @@
         super(CondaExecDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         self.__condaCommand = command
         
@@ -54,9 +56,13 @@
         @param button button that was clicked
         @type QAbstractButton
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.accept()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.__finish(1, 0)
     
     def start(self, arguments):
@@ -117,14 +123,17 @@
         @type bool
         """
         if (self.__process is not None and
-           self.__process.state() != QProcess.NotRunning):
+           self.__process.state() != QProcess.ProcessState.NotRunning):
             self.__process.terminate()
             QTimer.singleShot(2000, self.__process.kill)
             self.__process.waitForFinished(3000)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         
         self.progressLabel.hide()
         self.progressBar.hide()
@@ -258,7 +267,7 @@
         It reads the error output of the process and inserts it into the
         error pane.
         """
-        self.__process.setReadChannel(QProcess.StandardError)
+        self.__process.setReadChannel(QProcess.ProcessChannel.StandardError)
         
         while self.__process.canReadLine():
             stderr = str(self.__process.readLine(),
--- a/eric6/CondaInterface/CondaExportDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaExportDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -43,10 +43,10 @@
         """
         super(CondaExportDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.__refreshButton = self.buttonBox.addButton(
-            self.tr("&Refresh"), QDialogButtonBox.ActionRole)
+            self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole)
         
         self.requirementsFilePicker.setMode(E5PathPickerModes.SaveFileMode)
         self.requirementsFilePicker.setFilters(
@@ -96,7 +96,9 @@
         @param button button that was clicked
         @type QAbstractButton
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.close()
         elif button == self.__refreshButton:
             self.__refresh()
--- a/eric6/CondaInterface/CondaInfoDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaInfoDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -30,7 +30,7 @@
         """
         super(CondaInfoDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.iconLabel.setPixmap(
             UI.PixmapCache.getPixmap("miniconda48"))
--- a/eric6/CondaInterface/CondaNewEnvironmentDataDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaNewEnvironmentDataDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -58,7 +58,8 @@
         if self.__requirementsMode:
             enable &= bool(self.requirementsFilePicker.text())
         
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
     
     @pyqtSlot(str)
     def on_nameEdit_textChanged(self, txt):
--- a/eric6/CondaInterface/CondaPackageDetailsWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaPackageDetailsWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -55,7 +55,8 @@
             self.dependenciesEdit.setPlainText("\n".join(details["depends"]))
         
         if "timestamp" in details:
-            dt = QDateTime.fromMSecsSinceEpoch(details["timestamp"], Qt.UTC)
+            dt = QDateTime.fromMSecsSinceEpoch(details["timestamp"],
+                                               Qt.TimeSpec.UTC)
             self.timestampLabel.setText(dt.toString("yyyy-MM-dd hh:mm:ss t"))
         
         self.resize(600, 450)
@@ -84,7 +85,8 @@
         size = self.__cw.size()
         self.__layout.addWidget(self.__cw)
         self.__buttonBox = QDialogButtonBox(self)
-        self.__buttonBox.setStandardButtons(QDialogButtonBox.Close)
+        self.__buttonBox.setStandardButtons(
+            QDialogButtonBox.StandardButton.Close)
         self.__layout.addWidget(self.__buttonBox)
         
         self.resize(size)
--- a/eric6/CondaInterface/CondaPackagesWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaPackagesWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -31,11 +31,11 @@
     Class implementing the conda packages management widget.
     """
     # Role definition of packages list
-    PackageVersionRole = Qt.UserRole + 1
-    PackageBuildRole = Qt.UserRole + 2
+    PackageVersionRole = Qt.ItemDataRole.UserRole + 1
+    PackageBuildRole = Qt.ItemDataRole.UserRole + 2
     
     # Role definitions of search results list
-    PackageDetailedDataRole = Qt.UserRole + 1
+    PackageDetailedDataRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, conda, parent=None):
         """
@@ -70,9 +70,11 @@
             "conda_supermenu_button")
         self.condaMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu"))
         self.condaMenuButton.setToolTip(self.tr("Conda Menu"))
-        self.condaMenuButton.setPopupMode(QToolButton.InstantPopup)
-        self.condaMenuButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
-        self.condaMenuButton.setFocusPolicy(Qt.NoFocus)
+        self.condaMenuButton.setPopupMode(
+            QToolButton.ToolButtonPopupMode.InstantPopup)
+        self.condaMenuButton.setToolButtonStyle(
+            Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.condaMenuButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.condaMenuButton.setAutoRaise(True)
         self.condaMenuButton.setShowMenuInside(True)
         
@@ -241,7 +243,9 @@
                     prefix=prefix)
                 for package, version, build in updateablePackages:
                     items = self.packagesList.findItems(
-                        package, Qt.MatchExactly | Qt.MatchCaseSensitive)
+                        package,
+                        Qt.MatchFlag.MatchExactly |
+                        Qt.MatchFlag.MatchCaseSensitive)
                     if items:
                         itm = items[0]
                         itm.setText(2, version)
@@ -258,7 +262,7 @@
                                 itm.data(2, self.PackageBuildRole),
                             ))
                 
-                self.packagesList.sortItems(0, Qt.AscendingOrder)
+                self.packagesList.sortItems(0, Qt.SortOrder.AscendingOrder)
                 for col in range(self.packagesList.columnCount()):
                     self.packagesList.resizeColumnToContents(col)
                 self.packagesList.setUpdatesEnabled(True)
@@ -287,7 +291,8 @@
             self.__populateEnvironments()
             
             index = self.environmentsComboBox.findText(
-                currentEnvironment, Qt.MatchExactly | Qt.MatchCaseSensitive)
+                currentEnvironment,
+                Qt.MatchFlag.MatchExactly | Qt.MatchFlag.MatchCaseSensitive)
             if index != -1:
                 self.environmentsComboBox.setCurrentIndex(index)
         
@@ -386,7 +391,8 @@
                                 citm.setData(0, self.PackageDetailedDataRole,
                                              detail)
                     
-                        self.searchResultList.sortItems(0, Qt.AscendingOrder)
+                        self.searchResultList.sortItems(
+                            0, Qt.SortOrder.AscendingOrder)
                         self.searchResultList.resizeColumnToContents(0)
                         self.searchResultList.setUpdatesEnabled(True)
             if not ok:
@@ -511,7 +517,7 @@
         self.searchWidget.setVisible(checked)
         
         if checked:
-            self.searchEdit.setFocus(Qt.OtherFocusReason)
+            self.searchEdit.setFocus(Qt.FocusReason.OtherFocusReason)
             self.searchEdit.selectAll()
             
             self.__updateSearchActionButtons()
@@ -556,7 +562,7 @@
                 self,
                 self.tr("Install Packages"),
                 self.tr("Package Specifications (separated by whitespace):"),
-                QLineEdit.Normal,
+                QLineEdit.EchoMode.Normal,
                 minimumWidth=600)
             if ok and packageSpecs.strip():
                 packages = [p.strip() for p in packageSpecs.split()]
@@ -616,7 +622,7 @@
         if prefix:
             dlg = CondaNewEnvironmentDataDialog(self.tr("Clone Environment"),
                                                 False, self)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 virtEnvName, envName, _ = dlg.getData()
                 args = [
                     "--name",
@@ -640,7 +646,7 @@
         
         dlg = CondaNewEnvironmentDataDialog(self.tr("Create Environment"),
                                             True, self)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             virtEnvName, envName, requirements = dlg.getData()
             args = [
                 "--name",
--- a/eric6/Cooperation/ChatWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Cooperation/ChatWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -83,7 +83,7 @@
         self.__client.editorCommand.connect(self.__editorCommandMessage)
         
         self.serverButton.setText(self.tr("Start Server"))
-        self.serverLed.setColor(QColor(Qt.red))
+        self.serverLed.setColor(QColor(Qt.GlobalColor.red))
         if port == -1:
             port = Preferences.getCooperation("ServerPort")
         
@@ -167,10 +167,10 @@
             return
         
         color = self.chatEdit.textColor()
-        self.chatEdit.setTextColor(Qt.gray)
+        self.chatEdit.setTextColor(Qt.GlobalColor.gray)
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            ":")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + ":")
         self.chatEdit.append(self.tr("* {0} has joined.\n").format(nick))
         self.chatEdit.setTextColor(color)
         
@@ -197,16 +197,16 @@
         if nick == "":
             return
         
-        items = self.usersList.findItems(nick, Qt.MatchExactly)
+        items = self.usersList.findItems(nick, Qt.MatchFlag.MatchExactly)
         for item in items:
             self.usersList.takeItem(self.usersList.row(item))
             del item
             
             color = self.chatEdit.textColor()
-            self.chatEdit.setTextColor(Qt.gray)
+            self.chatEdit.setTextColor(Qt.GlobalColor.gray)
             self.chatEdit.append(
-                QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-                ":")
+                QDateTime.currentDateTime().toString(
+                    Qt.DateFormat.SystemLocaleLongDate) + ":")
             self.chatEdit.append(self.tr("* {0} has left.\n").format(nick))
             self.chatEdit.setTextColor(color)
         
@@ -230,8 +230,8 @@
             return
         
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            " <" + from_ + ">:")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + " <" + from_ + ">:")
         self.chatEdit.append(message + "\n")
         bar = self.chatEdit.verticalScrollBar()
         bar.setValue(bar.maximum())
@@ -308,7 +308,7 @@
                     Preferences.getCooperation("ServerPort")):
                 self.serverPortSpin.setValue(
                     Preferences.getCooperation("ServerPort"))
-            self.serverLed.setColor(QColor(Qt.red))
+            self.serverLed.setColor(QColor(Qt.GlobalColor.red))
         else:
             res, port = self.__client.startListening(
                 self.serverPortSpin.value())
@@ -316,7 +316,7 @@
                 self.serverButton.setText(self.tr("Stop Server"))
                 self.serverPortSpin.setValue(port)
                 self.serverPortSpin.setEnabled(False)
-                self.serverLed.setColor(QColor(Qt.green))
+                self.serverLed.setColor(QColor(Qt.GlobalColor.green))
             else:
                 self.__showErrorMessage(
                     self.tr("! Server Error: {0}\n").format(
@@ -332,11 +332,11 @@
         if connected:
             self.connectButton.setText(self.tr("Disconnect"))
             self.connectButton.setEnabled(True)
-            self.connectionLed.setColor(QColor(Qt.green))
+            self.connectionLed.setColor(QColor(Qt.GlobalColor.green))
         else:
             self.connectButton.setText(self.tr("Connect"))
             self.connectButton.setEnabled(self.hostEdit.currentText() != "")
-            self.connectionLed.setColor(QColor(Qt.red))
+            self.connectionLed.setColor(QColor(Qt.GlobalColor.red))
             self.on_cancelEditButton_clicked()
             self.shareButton.setChecked(False)
             self.on_shareButton_clicked(False)
@@ -358,10 +358,10 @@
         @param message error message to show (string)
         """
         color = self.chatEdit.textColor()
-        self.chatEdit.setTextColor(Qt.red)
+        self.chatEdit.setTextColor(Qt.GlobalColor.red)
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            ":")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + ":")
         self.chatEdit.append(message + "\n")
         self.chatEdit.setTextColor(color)
     
@@ -645,10 +645,10 @@
         self.__client.kickUser(itm.text())
         
         color = self.chatEdit.textColor()
-        self.chatEdit.setTextColor(Qt.darkYellow)
+        self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            ":")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + ":")
         self.chatEdit.append(self.tr("* {0} has been kicked.\n").format(
             itm.text().split("@")[0]))
         self.chatEdit.setTextColor(color)
@@ -661,10 +661,10 @@
         self.__client.banUser(itm.text())
         
         color = self.chatEdit.textColor()
-        self.chatEdit.setTextColor(Qt.darkYellow)
+        self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            ":")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + ":")
         self.chatEdit.append(self.tr("* {0} has been banned.\n").format(
             itm.text().split("@")[0]))
         self.chatEdit.setTextColor(color)
@@ -677,10 +677,10 @@
         self.__client.banKickUser(itm.text())
         
         color = self.chatEdit.textColor()
-        self.chatEdit.setTextColor(Qt.darkYellow)
+        self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
-            ":")
+            QDateTime.currentDateTime().toString(
+                Qt.DateFormat.SystemLocaleLongDate) + ":")
         self.chatEdit.append(
             self.tr("* {0} has been banned and kicked.\n")
                 .format(itm.text().split("@")[0]))
--- a/eric6/Cooperation/ChatWidget.ui	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Cooperation/ChatWidget.ui	Tue Mar 02 17:17:09 2021 +0100
@@ -216,7 +216,7 @@
            <enum>QComboBox::InsertAtTop</enum>
           </property>
           <property name="sizeAdjustPolicy">
-           <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+           <enum>QComboBox::AdjustToContents</enum>
           </property>
          </widget>
         </item>
--- a/eric6/Cooperation/CooperationClient.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Cooperation/CooperationClient.py	Tue Mar 02 17:17:09 2021 +0100
@@ -215,7 +215,7 @@
         @param connection connection that caused the error
         @type Connection
         """
-        if socketError != QAbstractSocket.RemoteHostClosedError:
+        if socketError != QAbstractSocket.SocketError.RemoteHostClosedError:
             if connection.peerPort() != 0:
                 msg = "* {0}:{1}\n{2}\n".format(
                     connection.peerAddress().toString(),
--- a/eric6/DataViews/CodeMetricsDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/DataViews/CodeMetricsDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -34,10 +34,12 @@
         """
         super(CodeMetricsDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         self.summaryList.headerItem().setText(
             self.summaryList.columnCount(), "")
@@ -52,7 +54,8 @@
         self.__menu.addAction(self.tr("Collapse All"),
                               self.__resultCollapse)
         self.__menu.addAction(self.tr("Expand All"), self.__resultExpand)
-        self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.resultList.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.resultList.customContextMenuRequested.connect(
             self.__showContextMenu)
         
@@ -64,7 +67,8 @@
         """
         Private method to resize the list columns.
         """
-        self.resultList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.resultList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.resultList.header().setStretchLastSection(True)
         
     def __createResultItem(self, parent, values):
@@ -83,14 +87,16 @@
                 data.append(value)
         itm = QTreeWidgetItem(parent, data)
         for col in range(1, 7):
-            itm.setTextAlignment(col, Qt.Alignment(Qt.AlignRight))
+            itm.setTextAlignment(
+                col, Qt.Alignment(Qt.AlignmentFlag.AlignRight))
         return itm
         
     def __resizeSummaryColumns(self):
         """
         Private method to resize the list columns.
         """
-        self.summaryList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.summaryList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.summaryList.header().setStretchLastSection(True)
         
     def __createSummaryItem(self, col0, col1):
@@ -101,7 +107,7 @@
         @param col1 string for column 1 (string)
         """
         itm = QTreeWidgetItem(self.summaryList, [col0, col1])
-        itm.setTextAlignment(1, Qt.Alignment(Qt.AlignRight))
+        itm.setTextAlignment(1, Qt.Alignment(Qt.AlignmentFlag.AlignRight))
         
     def prepare(self, fileList, project):
         """
@@ -113,9 +119,12 @@
         self.__fileList = fileList[:]
         self.__project = project
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         
         self.filterFrame.setVisible(True)
         
@@ -132,9 +141,12 @@
                 the code metrics for (string or list of strings)
         """
         self.cancelled = False
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         QApplication.processEvents()
         
         loc = QLocale()
@@ -231,12 +243,17 @@
         button.
         """
         self.cancelled = True
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         
-        self.resultList.header().setSectionResizeMode(QHeaderView.Interactive)
-        self.summaryList.header().setSectionResizeMode(QHeaderView.Interactive)
+        self.resultList.header().setSectionResizeMode(
+            QHeaderView.ResizeMode.Interactive)
+        self.summaryList.header().setSectionResizeMode(
+            QHeaderView.ResizeMode.Interactive)
         
     def on_buttonBox_clicked(self, button):
         """
@@ -244,9 +261,13 @@
         
         @param button button that was clicked (QAbstractButton)
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.close()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.__finish()
         
     @pyqtSlot()
--- a/eric6/DataViews/PyCoverageDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/DataViews/PyCoverageDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -38,10 +38,12 @@
         """
         super(PyCoverageDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         self.summaryList.headerItem().setText(
             self.summaryList.columnCount(), "")
@@ -65,7 +67,8 @@
             self.tr('Delete annotated files'), self.__deleteAnnotated)
         self.__menu.addSeparator()
         self.__menu.addAction(self.tr('Erase Coverage Info'), self.__erase)
-        self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.resultList.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.resultList.customContextMenuRequested.connect(
             self.__showContextMenu)
     
@@ -135,7 +138,7 @@
             missing
         ])
         for col in range(1, 4):
-            itm.setTextAlignment(col, Qt.AlignRight)
+            itm.setTextAlignment(col, Qt.AlignmentFlag.AlignRight)
         if statements != executed:
             font = itm.font(0)
             font.setBold(True)
@@ -235,7 +238,7 @@
                 "{0:.0f}%".format(pc)
             ])
             for col in range(0, 3):
-                itm.setTextAlignment(col, Qt.AlignRight)
+                itm.setTextAlignment(col, Qt.AlignmentFlag.AlignRight)
         else:
             self.summaryGroup.hide()
         
@@ -255,13 +258,18 @@
         button.
         """
         self.cancelled = True
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         QApplication.processEvents()
-        self.resultList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.resultList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.resultList.header().setStretchLastSection(True)
-        self.summaryList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.summaryList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.summaryList.header().setStretchLastSection(True)
         
     def on_buttonBox_clicked(self, button):
@@ -270,9 +278,13 @@
         
         @param button button that was clicked (QAbstractButton)
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.close()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.__finish()
         
     def __showContextMenu(self, coord):
@@ -400,9 +412,12 @@
             self.excludeList.remove(excludePattern)
         self.excludeList.insert(0, excludePattern)
         self.cancelled = False
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         self.start(self.__cfn, self.__fn)
     
     @pyqtSlot(QTreeWidgetItem, int)
--- a/eric6/DataViews/PyProfileDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/DataViews/PyProfileDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -65,10 +65,12 @@
         """
         super(PyProfileDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         self.cancelled = False
         self.exclude = True
@@ -79,7 +81,8 @@
         self.summaryList.headerItem().setText(
             self.summaryList.columnCount(), "")
         self.resultList.headerItem().setText(self.resultList.columnCount(), "")
-        self.resultList.header().setSortIndicator(0, Qt.DescendingOrder)
+        self.resultList.header().setSortIndicator(
+            0, Qt.SortOrder.DescendingOrder)
         
         self.__menu = QMenu(self)
         self.filterItm = self.__menu.addAction(
@@ -92,10 +95,12 @@
             self.tr('Erase Timing Info'), self.__eraseTiming)
         self.__menu.addSeparator()
         self.__menu.addAction(self.tr('Erase All Infos'), self.__eraseAll)
-        self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.resultList.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.resultList.customContextMenuRequested.connect(
             self.__showContextMenu)
-        self.summaryList.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.summaryList.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.summaryList.customContextMenuRequested.connect(
             self.__showContextMenu)
         
@@ -125,7 +130,7 @@
             functionName
         ])
         for col in [0, 1, 2, 3, 4, 6]:
-            itm.setTextAlignment(col, Qt.AlignRight)
+            itm.setTextAlignment(col, Qt.AlignmentFlag.AlignRight)
         
     def __createSummaryItem(self, label, contents):
         """
@@ -135,7 +140,7 @@
         @param contents text of the second column (string)
         """
         itm = QTreeWidgetItem(self.summaryList, [label, contents])
-        itm.setTextAlignment(1, Qt.AlignRight)
+        itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)
         
     def __resortResultList(self):
         """
@@ -262,13 +267,18 @@
         button.
         """
         self.cancelled = True
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         QApplication.processEvents()
-        self.resultList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.resultList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.resultList.header().setStretchLastSection(True)
-        self.summaryList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.summaryList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.summaryList.header().setStretchLastSection(True)
         
     def __unfinish(self):
@@ -276,9 +286,12 @@
         Private slot called to revert the effects of the __finish slot.
         """
         self.cancelled = False
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
     def on_buttonBox_clicked(self, button):
         """
@@ -286,9 +299,13 @@
         
         @param button button that was clicked (QAbstractButton)
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.close()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.__finish()
         
     def __showContextMenu(self, coord):
--- a/eric6/DebugClients/Python/QProcessExtension.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/DebugClients/Python/QProcessExtension.py	Tue Mar 02 17:17:09 2021 +0100
@@ -68,14 +68,14 @@
                     if len(args) > 2:
                         mode = args[2]
                     else:
-                        mode = module.QIODevice.ReadWrite
+                        mode = module.QIODevice.OpenModeFlag.ReadWrite
                 else:
                     program = self.program()
                     arguments = self.arguments()
                     if len(args) == 1:
                         mode = args[0]
                     else:
-                        mode = module.QIODevice.ReadWrite
+                        mode = module.QIODevice.OpenModeFlag.ReadWrite
                 ok = isPythonProgram(program)
                 if ok:
                     if startsWithShebang(program):
--- a/eric6/Debugger/BreakPointModel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/BreakPointModel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -43,13 +43,13 @@
             self.tr('Enabled'),
             self.tr('Ignore Count'),
         ]
-        self.alignments = [Qt.Alignment(Qt.AlignLeft),
-                           Qt.Alignment(Qt.AlignRight),
-                           Qt.Alignment(Qt.AlignLeft),
-                           Qt.Alignment(Qt.AlignHCenter),
-                           Qt.Alignment(Qt.AlignHCenter),
-                           Qt.Alignment(Qt.AlignRight),
-                           Qt.Alignment(Qt.AlignHCenter),
+        self.alignments = [Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
                            ]
 
     def columnCount(self, parent=None):
@@ -78,7 +78,7 @@
         else:
             return 0
     
-    def data(self, index, role=Qt.DisplayRole):
+    def data(self, index, role=Qt.ItemDataRole.DisplayRole):
         """
         Public method to get the requested data.
         
@@ -92,7 +92,7 @@
         if not index.isValid():
             return None
         
-        if role == Qt.DisplayRole:
+        if role == Qt.ItemDataRole.DisplayRole:
             if index.column() == 0:
                 filename = self.breakpoints[index.row()][0]
                 if self.__project.isOpen():
@@ -102,21 +102,21 @@
             elif index.column() in (1, 2, 5):
                 return self.breakpoints[index.row()][index.column()]
         
-        if role == Qt.CheckStateRole:
+        if role == Qt.ItemDataRole.CheckStateRole:
             if index.column() in (3, 4):
                 return self.breakpoints[index.row()][index.column()]
         
-        if role == Qt.ToolTipRole:
+        if role == Qt.ItemDataRole.ToolTipRole:
             if index.column() in (0, 2):
                 return self.breakpoints[index.row()][index.column()]
         
-        if role == Qt.TextAlignmentRole:
+        if role == Qt.ItemDataRole.TextAlignmentRole:
             if index.column() < len(self.alignments):
                 return self.alignments[index.column()]
         
         return None
     
-    def setData(self, index, value, role=Qt.EditRole):
+    def setData(self, index, value, role=Qt.ItemDataRole.EditRole):
         """
         Public method to change data in the model.
         
@@ -149,11 +149,12 @@
         @rtype Qt.ItemFlags
         """
         if not index.isValid():
-            return Qt.ItemIsEnabled
+            return Qt.ItemFlag.ItemIsEnabled
         
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+        return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
     
-    def headerData(self, section, orientation, role=Qt.DisplayRole):
+    def headerData(self, section, orientation,
+                   role=Qt.ItemDataRole.DisplayRole):
         """
         Public method to get header data.
         
@@ -166,7 +167,10 @@
         @return header data
         @rtype str
         """
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+        if (
+            orientation == Qt.Orientation.Horizontal and
+            role == Qt.ItemDataRole.DisplayRole
+        ):
             if section >= len(self.header):
                 return ""
             else:
--- a/eric6/Debugger/BreakPointViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/BreakPointViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -46,12 +46,14 @@
         self.setItemsExpandable(False)
         self.setRootIsDecorated(False)
         self.setAlternatingRowColors(True)
-        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
-        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.setSelectionBehavior(
+            QAbstractItemView.SelectionBehavior.SelectRows)
         
         self.setWindowTitle(self.tr("Breakpoints"))
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         self.doubleClicked.connect(self.__doubleClicked)
         
@@ -78,7 +80,7 @@
         super(BreakPointViewer, self).setModel(self.sortingModel)
         
         header = self.header()
-        header.setSortIndicator(0, Qt.AscendingOrder)
+        header.setSortIndicator(0, Qt.SortOrder.AscendingOrder)
         header.setSortIndicatorShown(True)
         header.setSectionsClickable(True)
         
@@ -98,7 +100,7 @@
         Private slot to resize the view when items get added, edited or
         deleted.
         """
-        self.header().resizeSections(QHeaderView.ResizeToContents)
+        self.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents)
         self.header().setStretchLastSection(True)
     
     def __resort(self):
@@ -144,10 +146,14 @@
         
         if selected:
             flags = QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows)
+                QItemSelectionModel.SelectionFlag.ClearAndSelect |
+                QItemSelectionModel.SelectionFlag.Rows
+            )
         else:
             flags = QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.Deselect | QItemSelectionModel.Rows)
+                QItemSelectionModel.SelectionFlag.Deselect |
+                QItemSelectionModel.SelectionFlag.Rows
+            )
         self.selectionModel().select(index, flags)
         
     def __createPopupMenus(self):
@@ -245,7 +251,7 @@
         dlg = EditBreakpointDialog((self.fnHistory[0], None), None,
                                    self.condHistory, self, modal=1,
                                    addMode=1, filenameHistory=self.fnHistory)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             fn, line, cond, temp, enabled, count = dlg.getAddData()
             if fn is not None:
                 if fn in self.fnHistory:
@@ -306,7 +312,7 @@
             dlg = EditBreakpointDialog(
                 (fn, line), (cond, temp, enabled, count),
                 self.condHistory, self, modal=True)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 cond, temp, enabled, count = dlg.getData()
                 if cond:
                     if cond in self.condHistory:
--- a/eric6/Debugger/CallStackViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/CallStackViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -28,8 +28,8 @@
     sourceFile = pyqtSignal(str, int)
     frameSelected = pyqtSignal(int)
     
-    FilenameRole = Qt.UserRole + 1
-    LinenoRole = Qt.UserRole + 2
+    FilenameRole = Qt.ItemDataRole.UserRole + 1
+    LinenoRole = Qt.ItemDataRole.UserRole + 2
     
     def __init__(self, debugServer, parent=None):
         """
@@ -61,7 +61,8 @@
         self.__menu.addAction(self.tr("Clear"), self.__callStackList.clear)
         self.__menu.addSeparator()
         self.__menu.addAction(self.tr("Save"), self.__saveStackTrace)
-        self.__callStackList.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.__callStackList.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.__callStackList.customContextMenuRequested.connect(
             self.__showContextMenu)
         
--- a/eric6/Debugger/CallTraceViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/CallTraceViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -184,7 +184,7 @@
                         f.write("{0}\n\n".format(len(title) * "="))
                         itm = self.callTrace.topLevelItem(0)
                         while itm is not None:
-                            isCall = itm.data(0, Qt.UserRole)
+                            isCall = itm.data(0, Qt.ItemDataRole.UserRole)
                             if isCall:
                                 call = "->"
                             else:
@@ -287,7 +287,7 @@
                  self.__entryFormat.format(fromFile, fromLine, fromFunction),
                  self.__entryFormat.format(toFile, toLine, toFunction)])
             itm.setIcon(0, icon)
-            itm.setData(0, Qt.UserRole, isCall)
+            itm.setData(0, Qt.ItemDataRole.UserRole, isCall)
             itm.setExpanded(True)
             
             if isCall:
--- a/eric6/Debugger/DebugServer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/DebugServer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -212,9 +212,11 @@
         
         self.networkInterface = Preferences.getDebugger("NetworkInterface")
         if self.networkInterface == "all":
-            hostAddress = QHostAddress("0.0.0.0")  # QHostAddress.Any)  # secok
+            hostAddress = QHostAddress("0.0.0.0")
+            # QHostAddress.SpecialAddress.Any)  # secok
         elif self.networkInterface == "allv6":
-            hostAddress = QHostAddress("::")  # QHostAddress.AnyIPv6)
+            hostAddress = QHostAddress("::")
+            # QHostAddress.SpecialAddress.AnyIPv6)
         else:
             hostAddress = QHostAddress(self.networkInterface)
         self.networkInterfaceName, self.networkInterfaceIndex = (
--- a/eric6/Debugger/DebugUI.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/DebugUI.py	Tue Mar 02 17:17:09 2021 +0100
@@ -201,7 +201,7 @@
             self.tr('Run Script'),
             UI.PixmapCache.getIcon("runScript"),
             self.tr('&Run Script...'),
-            Qt.Key_F2, 0, self, 'dbg_run_script')
+            Qt.Key.Key_F2, 0, self, 'dbg_run_script')
         self.runAct.setStatusTip(self.tr('Run the current Script'))
         self.runAct.setWhatsThis(self.tr(
             """<b>Run Script</b>"""
@@ -215,8 +215,9 @@
         self.runProjectAct = E5Action(
             self.tr('Run Project'),
             UI.PixmapCache.getIcon("runProject"),
-            self.tr('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self,
-            'dbg_run_project')
+            self.tr('Run &Project...'),
+            Qt.Modifier.SHIFT + Qt.Key.Key_F2,
+            0, self, 'dbg_run_project')
         self.runProjectAct.setStatusTip(self.tr('Run the current Project'))
         self.runProjectAct.setWhatsThis(self.tr(
             """<b>Run Project</b>"""
@@ -293,7 +294,7 @@
         self.debugAct = E5Action(
             self.tr('Debug Script'),
             UI.PixmapCache.getIcon("debugScript"),
-            self.tr('&Debug Script...'), Qt.Key_F5, 0, self,
+            self.tr('&Debug Script...'), Qt.Key.Key_F5, 0, self,
             'dbg_debug_script')
         self.debugAct.setStatusTip(self.tr('Debug the current Script'))
         self.debugAct.setWhatsThis(self.tr(
@@ -309,8 +310,9 @@
         self.debugProjectAct = E5Action(
             self.tr('Debug Project'),
             UI.PixmapCache.getIcon("debugProject"),
-            self.tr('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self,
-            'dbg_debug_project')
+            self.tr('Debug &Project...'),
+            Qt.Modifier.SHIFT + Qt.Key.Key_F5,
+            0, self, 'dbg_debug_project')
         self.debugProjectAct.setStatusTip(self.tr(
             'Debug the current Project'))
         self.debugProjectAct.setWhatsThis(self.tr(
@@ -326,7 +328,7 @@
         self.restartAct = E5Action(
             self.tr('Restart'),
             UI.PixmapCache.getIcon("debugRestart"),
-            self.tr('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script')
+            self.tr('Restart'), Qt.Key.Key_F4, 0, self, 'dbg_restart_script')
         self.restartAct.setStatusTip(self.tr(
             'Restart the last debugged script'))
         self.restartAct.setWhatsThis(self.tr(
@@ -342,7 +344,7 @@
         self.stopAct = E5Action(
             self.tr('Stop'),
             UI.PixmapCache.getIcon("stopScript"),
-            self.tr('Stop'), Qt.SHIFT + Qt.Key_F10, 0,
+            self.tr('Stop'), Qt.Modifier.SHIFT + Qt.Key.Key_F10, 0,
             self, 'dbg_stop_script')
         self.stopAct.setStatusTip(self.tr("""Stop the running script."""))
         self.stopAct.setWhatsThis(self.tr(
@@ -357,7 +359,7 @@
         act = E5Action(
             self.tr('Continue'),
             UI.PixmapCache.getIcon("continue"),
-            self.tr('&Continue'), Qt.Key_F6, 0,
+            self.tr('&Continue'), Qt.Key.Key_F6, 0,
             self.debugActGrp, 'dbg_continue')
         act.setStatusTip(
             self.tr('Continue running the program from the current line'))
@@ -373,8 +375,9 @@
         act = E5Action(
             self.tr('Continue to Cursor'),
             UI.PixmapCache.getIcon("continueToCursor"),
-            self.tr('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0,
-            self.debugActGrp, 'dbg_continue_to_cursor')
+            self.tr('Continue &To Cursor'),
+            Qt.Modifier.SHIFT + Qt.Key.Key_F6,
+            0, self.debugActGrp, 'dbg_continue_to_cursor')
         act.setStatusTip(self.tr(
             """Continue running the program from the"""
             """ current line to the current cursor position"""))
@@ -389,7 +392,7 @@
         act = E5Action(
             self.tr('Continue Until'),
             UI.PixmapCache.getIcon("continueUntil"),
-            self.tr('Continue &Until'), Qt.CTRL + Qt.Key_F6, 0,
+            self.tr('Continue &Until'), Qt.Modifier.CTRL + Qt.Key.Key_F6, 0,
             self.debugActGrp, 'dbg_continue_until')
         act.setStatusTip(self.tr(
             """Continue running the program from the current line to the"""
@@ -406,7 +409,7 @@
         act = E5Action(
             self.tr('Move Instruction Pointer to Cursor'),
             UI.PixmapCache.getIcon("moveInstructionPointer"),
-            self.tr('&Jump To Cursor'), Qt.Key_F12, 0,
+            self.tr('&Jump To Cursor'), Qt.Key.Key_F12, 0,
             self.debugActGrp, 'dbg_jump_to_cursor')
         act.setStatusTip(self.tr(
             """Skip the code from the"""
@@ -426,7 +429,7 @@
         act = E5Action(
             self.tr('Single Step'),
             UI.PixmapCache.getIcon("step"),
-            self.tr('Sin&gle Step'), Qt.Key_F7, 0,
+            self.tr('Sin&gle Step'), Qt.Key.Key_F7, 0,
             self.debugActGrp, 'dbg_single_step')
         act.setStatusTip(self.tr('Execute a single Python statement'))
         act.setWhatsThis(self.tr(
@@ -442,7 +445,7 @@
         act = E5Action(
             self.tr('Step Over'),
             UI.PixmapCache.getIcon("stepOver"),
-            self.tr('Step &Over'), Qt.Key_F8, 0,
+            self.tr('Step &Over'), Qt.Key.Key_F8, 0,
             self.debugActGrp, 'dbg_step_over')
         act.setStatusTip(self.tr(
             """Execute a single Python statement staying"""
@@ -461,7 +464,7 @@
         act = E5Action(
             self.tr('Step Out'),
             UI.PixmapCache.getIcon("stepOut"),
-            self.tr('Step Ou&t'), Qt.Key_F9, 0,
+            self.tr('Step Ou&t'), Qt.Key.Key_F9, 0,
             self.debugActGrp, 'dbg_step_out')
         act.setStatusTip(self.tr(
             """Execute Python statements until leaving"""
@@ -480,7 +483,7 @@
         act = E5Action(
             self.tr('Stop'),
             UI.PixmapCache.getIcon("stepQuit"),
-            self.tr('&Stop'), Qt.Key_F10, 0,
+            self.tr('&Stop'), Qt.Key.Key_F10, 0,
             self.debugActGrp, 'dbg_stop')
         act.setStatusTip(self.tr('Stop debugging'))
         act.setWhatsThis(self.tr(
@@ -1472,7 +1475,7 @@
         dlg = EditBreakpointDialog(
             (fn, line), (cond, temp, enabled, count),
             [], self.ui, modal=True)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             cond, temp, enabled, count = dlg.getData()
             model.setBreakPointByIndex(index, fn, line,
                                        (cond, temp, enabled, count))
@@ -1509,7 +1512,7 @@
         from .EditWatchpointDialog import EditWatchpointDialog
         dlg = EditWatchpointDialog(
             (cond, temp, enabled, count, special), self.ui)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             cond, temp, enabled, count, special = dlg.getData()
             
             # check for duplicates
@@ -1545,7 +1548,7 @@
         dlg = VariablesFilterDialog(self.ui, 'Filter Dialog', True)
         dlg.setSelection(self.__localsVarFilterList,
                          self.__globalsVarFilterList)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             self.__localsVarFilterList, self.__globalsVarFilterList = (
                 dlg.getSelection()
             )
@@ -1558,7 +1561,7 @@
         """
         from .ExceptionsFilterDialog import ExceptionsFilterDialog
         dlg = ExceptionsFilterDialog(self.excList, ignore=False)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             self.excList = dlg.getExceptionsList()[:]   # keep a copy
         
     def __configureIgnoredExceptions(self):
@@ -1567,7 +1570,7 @@
         """
         from .ExceptionsFilterDialog import ExceptionsFilterDialog
         dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore=True)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             self.excIgnoreList = dlg.getExceptionsList()[:]   # keep a copy
         
     def __toggleBreakpoint(self):
@@ -1689,7 +1692,7 @@
             cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 2,
             autoClearShell=self.autoClearShell)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             eraseCoverage = dlg.getCoverageData()
@@ -1826,7 +1829,7 @@
             cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 3,
             autoClearShell=self.autoClearShell)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             eraseTimings = dlg.getProfilingData()
@@ -1963,7 +1966,7 @@
             cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 1,
             autoClearShell=self.autoClearShell)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             
@@ -2099,7 +2102,7 @@
             autoContinue=self.autoContinue,
             enableMultiprocess=self.enableMultiprocess,
             multiprocessNoDebugHistory=self.multiprocessNoDebugHistory)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             (tracePython, autoContinue, enableMultiprocess,
--- a/eric6/Debugger/DebugViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/DebugViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -50,8 +50,8 @@
     sourceFile = pyqtSignal(str, int)
     preferencesChanged = pyqtSignal()
     
-    ThreadIdRole = Qt.UserRole + 1
-    DebuggerStateRole = Qt.UserRole + 2
+    ThreadIdRole = Qt.ItemDataRole.UserRole + 1
+    DebuggerStateRole = Qt.ItemDataRole.UserRole + 2
     
     # Map debug state to icon name
     StateIcon = {
@@ -93,7 +93,7 @@
         self.__mainLayout.setContentsMargins(0, 3, 0, 0)
         self.setLayout(self.__mainLayout)
         
-        self.__mainSplitter = QSplitter(Qt.Vertical, self)
+        self.__mainSplitter = QSplitter(Qt.Orientation.Vertical, self)
         self.__mainLayout.addWidget(self.__mainSplitter)
         
         # add the viewer showing the connected debug backends
@@ -135,7 +135,7 @@
         
         self.globalsFilterEdit = QLineEdit(self.glvWidget)
         self.globalsFilterEdit.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.glvWidgetHLayout.addWidget(self.globalsFilterEdit)
         self.globalsFilterEdit.setToolTip(
             self.tr("Enter regular expression patterns separated by ';'"
@@ -174,7 +174,7 @@
         
         self.stackComboBox = QComboBox(self.lvWidget)
         self.stackComboBox.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.lvWidgetHLayout1.addWidget(self.stackComboBox)
 
         self.sourceButton = QPushButton(self.tr('Source'), self.lvWidget)
@@ -190,7 +190,7 @@
         
         self.localsFilterEdit = QLineEdit(self.lvWidget)
         self.localsFilterEdit.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.lvWidgetHLayout2.addWidget(self.localsFilterEdit)
         self.localsFilterEdit.setToolTip(
             self.tr(
@@ -709,7 +709,7 @@
                 .format(debuggerId))
         
         self.__debuggersList.header().resizeSections(
-            QHeaderView.ResizeToContents)
+            QHeaderView.ResizeMode.ResizeToContents)
         
         if self.__debuggersList.topLevelItemCount() == 1:
             # it is the only item, select it as the current one
@@ -723,7 +723,7 @@
         @type str
         """
         debuggerItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if debuggerItems:
             debuggerItem = debuggerItems[0]
             currentItem = self.__debuggersList.currentItem()
@@ -802,7 +802,7 @@
         debuggerItem = None
         if debuggerId:
             foundItems = self.__debuggersList.findItems(
-                debuggerId, Qt.MatchExactly)
+                debuggerId, Qt.MatchFlag.MatchExactly)
             if foundItems:
                 debuggerItem = foundItems[0]
         if debuggerItem is None:
@@ -821,7 +821,7 @@
             debuggerItem.setText(1, stateText)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)
     
     def __removeDebugger(self, debuggerId):
         """
@@ -831,7 +831,7 @@
         @type str
         """
         foundItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if foundItems:
             index = self.__debuggersList.indexOfTopLevelItem(foundItems[0])
             itm = self.__debuggersList.takeTopLevelItem(index)
@@ -852,7 +852,7 @@
         debugStatus = -1    # i.e. running
         
         debuggerItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if debuggerItems:
             debuggerItem = debuggerItems[0]
             
@@ -890,7 +890,7 @@
             debuggerItem.setExpanded(debuggerItem.childCount() > 0)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)
             self.__debuggersList.header().setStretchLastSection(True)
             self.__doDebuggersListUpdate = True
             
@@ -918,7 +918,7 @@
         debuggerItem = None
         if debuggerId:
             foundItems = self.__debuggersList.findItems(
-                debuggerId, Qt.MatchExactly)
+                debuggerId, Qt.MatchFlag.MatchExactly)
             if foundItems:
                 debuggerItem = foundItems[0]
         if debuggerItem is None:
@@ -944,4 +944,4 @@
                 childItem.setText(1, stateText)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)
--- a/eric6/Debugger/EditBreakpointDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/EditBreakpointDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -45,9 +45,10 @@
         
         self.filenamePicker.setMode(E5PathPickerModes.OpenFileMode)
         self.filenamePicker.setSizeAdjustPolicy(
-            QComboBox.AdjustToMinimumContentsLength)
+            QComboBox.SizeAdjustPolicy.AdjustToContents)
         
-        self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
+        self.okButton = self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok)
         
         fn, lineno = breakPointId
         
--- a/eric6/Debugger/EditBreakpointDialog.ui	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/EditBreakpointDialog.ui	Tue Mar 02 17:17:09 2021 +0100
@@ -98,7 +98,7 @@
       <bool>true</bool>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+      <enum>QComboBox::AdjustToContents</enum>
      </property>
     </widget>
    </item>
--- a/eric6/Debugger/EditWatchpointDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/EditWatchpointDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -33,7 +33,8 @@
             self.setObjectName(name)
         self.setModal(modal)
         
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
         
         # connect our widgets
         self.conditionEdit.textChanged.connect(self.__textChanged)
@@ -77,15 +78,16 @@
         """
         if self.conditionButton.isChecked():
             self.buttonBox.button(
-                QDialogButtonBox.Ok
+                QDialogButtonBox.StandardButton.Ok
             ).setEnabled(self.conditionEdit.text() != "")
         elif self.specialButton.isChecked():
             self.buttonBox.button(
-                QDialogButtonBox.Ok
+                QDialogButtonBox.StandardButton.Ok
             ).setEnabled(self.specialEdit.text() != "")
         else:
             # should not happen
-            self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+            self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Ok).setEnabled(False)
         
     def getData(self):
         """
--- a/eric6/Debugger/ExceptionLogger.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/ExceptionLogger.py	Tue Mar 02 17:17:09 2021 +0100
@@ -40,7 +40,7 @@
         self.setHeaderLabels([self.tr("Exception")])
         self.setSortingEnabled(False)
 
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         self.itemDoubleClicked.connect(self.__itemDoubleClicked)
 
--- a/eric6/Debugger/ExceptionsFilterDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/ExceptionsFilterDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -36,7 +36,8 @@
             self.exceptionList.setToolTip(
                 self.tr("List of ignored exceptions"))
         
-        self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
+        self.okButton = self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok)
     
     @pyqtSlot()
     def on_exceptionList_itemSelectionChanged(self):
--- a/eric6/Debugger/StartCoverageDialog.ui	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/StartCoverageDialog.ui	Tue Mar 02 17:17:09 2021 +0100
@@ -133,6 +133,9 @@
         <string>&lt;b&gt;Virtual Environment&lt;/b&gt;
 &lt;p&gt;Enter the virtual environment to be used. Leave it empty to use the default environment, i.e. the one configured globally or per project.&lt;/p&gt;</string>
        </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+       </property>
       </widget>
      </item>
      <item row="0" column="0">
--- a/eric6/Debugger/StartDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/StartDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -101,14 +101,15 @@
         self.ui.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
         self.ui.workdirPicker.setDefaultDirectory(
             Preferences.getMultiProject("Workspace"))
-        self.ui.workdirPicker.setInsertPolicy(QComboBox.InsertAtTop)
+        self.ui.workdirPicker.setInsertPolicy(
+            QComboBox.InsertPolicy.InsertAtTop)
         self.ui.workdirPicker.setSizeAdjustPolicy(
-            QComboBox.AdjustToMinimumContentsLength)
+            QComboBox.SizeAdjustPolicy.AdjustToContents)
         
         self.clearButton = self.ui.buttonBox.addButton(
-            self.tr("Clear Histories"), QDialogButtonBox.ActionRole)
+            self.tr("Clear Histories"), QDialogButtonBox.ButtonRole.ActionRole)
         self.editButton = self.ui.buttonBox.addButton(
-            self.tr("Edit History"), QDialogButtonBox.ActionRole)
+            self.tr("Edit History"), QDialogButtonBox.ButtonRole.ActionRole)
         
         self.setWindowTitle(caption)
         self.ui.cmdlineCombo.clear()
@@ -161,8 +162,9 @@
         """
         Private slot to enable/disable the OK button.
         """
-        self.ui.buttonBox.button(QDialogButtonBox.Ok).setDisabled(
-            self.ui.modFuncCombo.currentText() == "")
+        self.ui.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setDisabled(
+                self.ui.modFuncCombo.currentText() == "")
         
     def getData(self):
         """
@@ -296,7 +298,7 @@
             if history:
                 from .StartHistoryEditDialog import StartHistoryEditDialog
                 dlg = StartHistoryEditDialog(history, self)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 history = dlg.getHistory()
                 combo = combos[historiesIndex]
                 if combo:
--- a/eric6/Debugger/StartHistoryEditDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/StartHistoryEditDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -34,7 +34,7 @@
         self.historyList.addItems(history)
         for row in range(self.historyList.count()):
             itm = self.historyList.item(row)
-            flags = itm.flags() | Qt.ItemIsEditable
+            flags = itm.flags() | Qt.ItemFlag.ItemIsEditable
             itm.setFlags(flags)
         
         self.__updateEditButtons()
@@ -65,7 +65,7 @@
             self,
             self.tr("Edit History Entry"),
             self.tr("Enter the new text:"),
-            QLineEdit.Normal,
+            QLineEdit.EchoMode.Normal,
             itm.text())
         if ok:
             itm.setText(historyText)
--- a/eric6/Debugger/VariablesFilterDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/VariablesFilterDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -38,15 +38,16 @@
         self.setupUi(self)
 
         self.defaultButton = self.buttonBox.addButton(
-            self.tr("Save Default"), QDialogButtonBox.ActionRole)
+            self.tr("Save Default"), QDialogButtonBox.ButtonRole.ActionRole)
         
         #populate the list widgets and set the default selection
         for widget in self.localsList, self.globalsList:
             for varType, varTypeStr in ConfigVarTypeDispStrings.items():
                 itm = QListWidgetItem(self.tr(varTypeStr), widget)
-                itm.setData(Qt.UserRole, varType)
-                itm.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
-                itm.setCheckState(Qt.Unchecked)
+                itm.setData(Qt.ItemDataRole.UserRole, varType)
+                itm.setFlags(Qt.ItemFlag.ItemIsEnabled |
+                             Qt.ItemFlag.ItemIsUserCheckable)
+                itm.setCheckState(Qt.CheckState.Unchecked)
                 widget.addItem(itm)
         
         lDefaultFilter, gDefaultFilter = Preferences.getVarFilters()
@@ -64,14 +65,14 @@
         lList = []
         for row in range(self.localsList.count()):
             itm = self.localsList.item(row)
-            if itm.checkState() == Qt.Unchecked:
-                lList.append(itm.data(Qt.UserRole))
+            if itm.checkState() == Qt.CheckState.Unchecked:
+                lList.append(itm.data(Qt.ItemDataRole.UserRole))
         
         gList = []
         for row in range(self.globalsList.count()):
             itm = self.globalsList.item(row)
-            if itm.checkState() == Qt.Unchecked:
-                gList.append(itm.data(Qt.UserRole))
+            if itm.checkState() == Qt.CheckState.Unchecked:
+                gList.append(itm.data(Qt.ItemDataRole.UserRole))
         return (lList, gList)
     
     def setSelection(self, lList, gList):
@@ -85,17 +86,17 @@
         """
         for row in range(self.localsList.count()):
             itm = self.localsList.item(row)
-            if itm.data(Qt.UserRole) in lList:
-                itm.setCheckState(Qt.Unchecked)
+            if itm.data(Qt.ItemDataRole.UserRole) in lList:
+                itm.setCheckState(Qt.CheckState.Unchecked)
             else:
-                itm.setCheckState(Qt.Checked)
+                itm.setCheckState(Qt.CheckState.Checked)
         
         for row in range(self.globalsList.count()):
             itm = self.globalsList.item(row)
-            if itm.data(Qt.UserRole) in gList:
-                itm.setCheckState(Qt.Unchecked)
+            if itm.data(Qt.ItemDataRole.UserRole) in gList:
+                itm.setCheckState(Qt.CheckState.Unchecked)
             else:
-                itm.setCheckState(Qt.Checked)
+                itm.setCheckState(Qt.CheckState.Checked)
 
     def on_buttonBox_clicked(self, button):
         """
--- a/eric6/Debugger/VariablesViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/VariablesViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -25,7 +25,7 @@
 import Preferences
 import Utilities
 
-SORT_ROLE = Qt.UserRole
+SORT_ROLE = Qt.ItemDataRole.UserRole
 
 
 class VariableItem(object):
@@ -554,9 +554,9 @@
         @rtype QtCore.Qt.ItemFlag
         """
         if not index.isValid():
-            return Qt.NoItemFlags
+            return Qt.ItemFlag.NoItemFlags
 
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+        return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
     
     def hasChildren(self, parent=QModelIndex()):
         """
@@ -619,7 +619,7 @@
         row = parentNode.parent.children.index(parentNode)
         return self.createIndex(row, 0, parentNode)
     
-    def data(self, index, role=Qt.DisplayRole):
+    def data(self, index, role=Qt.ItemDataRole.DisplayRole):
         """
         Public method get the role data of item.
         
@@ -636,7 +636,9 @@
         node = index.internalPointer()
         column = index.column()
         
-        if role in (Qt.DisplayRole, SORT_ROLE, Qt.EditRole):
+        if role in (
+            Qt.ItemDataRole.DisplayRole, SORT_ROLE, Qt.ItemDataRole.EditRole
+        ):
             try:
                 if column == 0:
                     # Sort first column with values from third column
@@ -654,13 +656,13 @@
             except AttributeError:
                 return ['None', '', '', ''][column]
         
-        elif role == Qt.BackgroundRole:
+        elif role == Qt.ItemDataRole.BackgroundRole:
             if node in node.parent.changedItems:
                 return self.__bgColorChanged
             elif node in node.parent.newItems:
                 return self.__bgColorNew
         
-        elif role == Qt.ToolTipRole:
+        elif role == Qt.ItemDataRole.ToolTipRole:
             if column == 0:
                 tooltip = node.name + node.indicator
             elif column == 1:
@@ -701,7 +703,8 @@
         
         return None
     
-    def headerData(self, section, orientation, role=Qt.DisplayRole):
+    def headerData(self, section, orientation,
+                   role=Qt.ItemDataRole.DisplayRole):
         """
         Public method get the header names.
         
@@ -714,7 +717,10 @@
         @return header name
         @rtype str or None
         """
-        if role != Qt.DisplayRole or orientation != Qt.Horizontal:
+        if (
+            role != Qt.ItemDataRole.DisplayRole or
+            orientation != Qt.Orientation.Horizontal
+        ):
             return None
         
         if section == 0:
@@ -952,7 +958,8 @@
         
         self.setSortingEnabled(True)
         self.setAlternatingRowColors(True)
-        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.setSelectionBehavior(
+            QAbstractItemView.SelectionBehavior.SelectRows)
         
         if self.__globalScope:
             self.setWindowTitle(self.tr("Global Variables"))
@@ -970,7 +977,7 @@
             ))
         
         header = self.header()
-        header.setSortIndicator(0, Qt.AscendingOrder)
+        header.setSortIndicator(0, Qt.SortOrder.AscendingOrder)
         header.setSortIndicatorShown(True)
         
         try:
@@ -985,7 +992,7 @@
         header.sortIndicatorChanged.connect(lambda *x: self.varModel.getMore())
         
         self.__createPopupMenus()
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         
         self.resortEnabled = True
--- a/eric6/Debugger/WatchPointModel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/WatchPointModel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -37,11 +37,11 @@
             self.tr('Enabled'),
             self.tr('Ignore Count'),
         ]
-        self.alignments = [Qt.Alignment(Qt.AlignLeft),
-                           Qt.Alignment(Qt.AlignLeft),
-                           Qt.Alignment(Qt.AlignHCenter),
-                           Qt.Alignment(Qt.AlignHCenter),
-                           Qt.Alignment(Qt.AlignRight),
+        self.alignments = [Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
+                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
                            ]
         
     def columnCount(self, parent=None):
@@ -77,19 +77,19 @@
         if not index.isValid():
             return None
         
-        if role == Qt.DisplayRole:
+        if role == Qt.ItemDataRole.DisplayRole:
             if index.column() in [0, 1, 4]:
                 return self.watchpoints[index.row()][index.column()]
         
-        if role == Qt.CheckStateRole:
+        if role == Qt.ItemDataRole.CheckStateRole:
             if index.column() in [2, 3]:
                 return self.watchpoints[index.row()][index.column()]
         
-        if role == Qt.ToolTipRole:
+        if role == Qt.ItemDataRole.ToolTipRole:
             if index.column() in [0, 1]:
                 return self.watchpoints[index.row()][index.column()]
         
-        if role == Qt.TextAlignmentRole:
+        if role == Qt.ItemDataRole.TextAlignmentRole:
             if index.column() < len(self.alignments):
                 return self.alignments[index.column()]
         
@@ -103,11 +103,12 @@
         @return item flags for the given index (Qt.ItemFlags)
         """
         if not index.isValid():
-            return Qt.ItemIsEnabled
+            return Qt.ItemFlag.ItemIsEnabled
         
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+        return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
     
-    def headerData(self, section, orientation, role=Qt.DisplayRole):
+    def headerData(self, section, orientation,
+                   role=Qt.ItemDataRole.DisplayRole):
         """
         Public method to get header data.
         
@@ -116,7 +117,10 @@
         @param role role of the requested data (Qt.ItemDataRole)
         @return header data
         """
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+        if (
+            orientation == Qt.Orientation.Horizontal and
+            role == Qt.ItemDataRole.DisplayRole
+        ):
             if section >= len(self.header):
                 return ""
             else:
--- a/eric6/Debugger/WatchPointViewer.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Debugger/WatchPointViewer.py	Tue Mar 02 17:17:09 2021 +0100
@@ -41,12 +41,14 @@
         self.setItemsExpandable(False)
         self.setRootIsDecorated(False)
         self.setAlternatingRowColors(True)
-        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
-        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.setSelectionBehavior(
+            QAbstractItemView.SelectionBehavior.SelectRows)
         
         self.setWindowTitle(self.tr("Watchpoints"))
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         self.doubleClicked.connect(self.__doubleClicked)
         
@@ -66,7 +68,7 @@
         super(WatchPointViewer, self).setModel(self.sortingModel)
         
         header = self.header()
-        header.setSortIndicator(0, Qt.AscendingOrder)
+        header.setSortIndicator(0, Qt.SortOrder.AscendingOrder)
         header.setSortIndicatorShown(True)
         header.setSectionsClickable(True)
         
@@ -86,7 +88,7 @@
         Private slot to resize the view when items get added, edited or
         deleted.
         """
-        self.header().resizeSections(QHeaderView.ResizeToContents)
+        self.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents)
         self.header().setStretchLastSection(True)
     
     def __resort(self):
@@ -126,10 +128,12 @@
         
         if selected:
             flags = QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows)
+                QItemSelectionModel.SelectionFlag.ClearAndSelect |
+                QItemSelectionModel.SelectionFlag.Rows)
         else:
             flags = QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.Deselect | QItemSelectionModel.Rows)
+                QItemSelectionModel.SelectionFlag.Deselect |
+                QItemSelectionModel.SelectionFlag.Rows)
         self.selectionModel().select(index, flags)
         
     def __createPopupMenus(self):
@@ -259,7 +263,7 @@
         """
         from .EditWatchpointDialog import EditWatchpointDialog
         dlg = EditWatchpointDialog(("", False, True, 0, ""), self)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             cond, temp, enabled, ignorecount, special = dlg.getData()
             if not self.__findDuplicates(cond, special, True):
                 self.__model.addWatchPoint(cond, special,
@@ -301,7 +305,7 @@
             from .EditWatchpointDialog import EditWatchpointDialog
             dlg = EditWatchpointDialog(
                 (cond, temp, enabled, count, special), self)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 cond, temp, enabled, count, special = dlg.getData()
                 if not self.__findDuplicates(cond, special, True, sindex):
                     self.__model.setWatchPointByIndex(
--- a/eric6/E5Graphics/E5ArrowItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Graphics/E5ArrowItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -51,14 +51,15 @@
         self._type = arrowType
         
         if colors is None:
-            self._colors = (QColor(Qt.black), QColor(Qt.white))
+            self._colors = (QColor(Qt.GlobalColor.black),
+                            QColor(Qt.GlobalColor.white))
         else:
             self._colors = colors
         
         self._halfLength = 13.0
         
-        self.setFlag(QGraphicsItem.ItemIsMovable, True)
-        self.setFlag(QGraphicsItem.ItemIsSelectable, True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, True)
         
     def setPoints(self, xa, ya, xb, yb):
         """
@@ -116,8 +117,8 @@
         @param widget optional reference to the widget painted on (QWidget)
         """
         if (
-            (option.state & QStyle.State_Selected) ==
-            QStyle.State(QStyle.State_Selected)
+            (option.state & QStyle.StateFlag.State_Selected) ==
+            QStyle.State(QStyle.StateFlag.State_Selected)
         ):
             width = 2
         else:
@@ -126,8 +127,8 @@
         # draw the line first
         line = QLineF(self._origin, self._end)
         painter.setPen(
-            QPen(self._colors[0], width, Qt.SolidLine, Qt.FlatCap,
-                 Qt.MiterJoin))
+            QPen(self._colors[0], width, Qt.PenStyle.SolidLine,
+                 Qt.PenCapStyle.FlatCap, Qt.PenJoinStyle.MiterJoin))
         painter.drawLine(line)
         
         # draw the arrow head
--- a/eric6/E5Graphics/E5GraphicsView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Graphics/E5GraphicsView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -47,12 +47,14 @@
         
         self.__initialSceneSize = self.scene().sceneRect().size()
         self.setBackgroundBrush(QBrush(self.getBackgroundColor()))
-        self.setRenderHint(QPainter.Antialiasing, True)
-        self.setDragMode(QGraphicsView.RubberBandDrag)
-        self.setAlignment(Qt.Alignment(Qt.AlignLeft | Qt.AlignTop))
-        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
-        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
-        self.setViewportUpdateMode(QGraphicsView.SmartViewportUpdate)
+        self.setRenderHint(QPainter.RenderHint.Antialiasing, True)
+        self.setDragMode(QGraphicsView.DragMode.RubberBandDrag)
+        self.setAlignment(Qt.Alignment(
+            Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop))
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
+        self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
+        self.setViewportUpdateMode(
+            QGraphicsView.ViewportUpdateMode.SmartViewportUpdate)
         
         self.setWhatsThis(self.tr(
             "<b>Graphics View</b>\n"
@@ -305,7 +307,7 @@
             paintDevice.setViewBox(rect)
             paintDevice.setFileName(filename)
         painter = QPainter(paintDevice)
-        painter.setRenderHint(QPainter.Antialiasing, True)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
         self.scene().render(painter, QRectF(), rect)
         
         # step 3: reselect the widgets
@@ -420,7 +422,7 @@
                              marginX + width, marginY + height + 2)
             painter.setFont(font)
             painter.drawText(marginX, marginY + height + 4, width,
-                             fontHeight, Qt.AlignRight, s)
+                             fontHeight, Qt.AlignmentFlag.AlignRight, s)
             if not finishX or not finishY:
                 printer.newPage()
                 page += 1
--- a/eric6/E5Gui/E5Action.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5Action.py	Tue Mar 02 17:17:09 2021 +0100
@@ -180,7 +180,8 @@
         """
         Private slot to add the primary keyboard accelerator to the tooltip.
         """
-        shortcut = self.shortcut().toString(QKeySequence.NativeText)
+        shortcut = self.shortcut().toString(
+            QKeySequence.SequenceFormat.NativeText)
         if shortcut:
             if e5App().isLeftToRight():
                 fmt = "{0} ({1})"
--- a/eric6/E5Gui/E5AnimatedWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5AnimatedWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -61,7 +61,7 @@
         """
         Public slot to start the animation.
         """
-        if self.__timeline.state() == QTimeLine.Running:
+        if self.__timeline.state() == QTimeLine.State.Running:
             return
         
         shown = 0
@@ -77,7 +77,7 @@
         self.__startY = hidden
         self.__stepHeight = self.__widget.height() / 100.0
         
-        self.__timeline.setDirection(QTimeLine.Forward)
+        self.__timeline.setDirection(QTimeLine.Direction.Forward)
         self.__timeline.start()
     
     @pyqtSlot(int)
@@ -97,10 +97,10 @@
         """
         Public slot to hide the animated widget.
         """
-        if self.__timeline.state() == QTimeLine.Running:
+        if self.__timeline.state() == QTimeLine.State.Running:
             return
         
-        self.__timeline.setDirection(QTimeLine.Backward)
+        self.__timeline.setDirection(QTimeLine.Direction.Backward)
         self.__timeline.finished.connect(self.close)
         self.__timeline.start()
         
--- a/eric6/E5Gui/E5Application.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5Application.py	Tue Mar 02 17:17:09 2021 +0100
@@ -11,8 +11,10 @@
 from PyQt5.QtGui import QPalette
 from PyQt5.QtWidgets import QApplication
 
-QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
-QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts, True)
+QCoreApplication.setAttribute(
+    Qt.ApplicationAttribute.AA_EnableHighDpiScaling, True)
+QCoreApplication.setAttribute(
+    Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True)
 
 
 class E5Application(QApplication):
@@ -29,8 +31,9 @@
         super(E5Application, self).__init__(argv)
         
         QCoreApplication.setAttribute(
-            Qt.AA_DontCreateNativeWidgetSiblings, True)
-        QCoreApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
+            Qt.ApplicationAttribute.AA_DontCreateNativeWidgetSiblings, True)
+        QCoreApplication.setAttribute(
+            Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True)
         
         self.__objectRegistry = {}
         self.__pluginObjectRegistry = {}
@@ -147,7 +150,7 @@
         @rtype bool
         """
         palette = self.palette()
-        lightness = palette.color(QPalette.Window).lightness()
+        lightness = palette.color(QPalette.ColorRole.Window).lightness()
         return lightness <= 128
 
 e5App = QCoreApplication.instance
--- a/eric6/E5Gui/E5ClickableLabel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ClickableLabel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -31,7 +31,7 @@
         """
         super(E5ClickableLabel, self).__init__(parent)
         
-        self.setCursor(Qt.PointingHandCursor)
+        self.setCursor(Qt.CursorShape.PointingHandCursor)
     
     def mouseReleaseEvent(self, evt):
         """
@@ -39,13 +39,16 @@
         
         @param evt mouse event (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton and self.rect().contains(evt.pos()):
-            if evt.modifiers() == Qt.ControlModifier:
+        if (
+            evt.button() == Qt.MouseButton.LeftButton and
+            self.rect().contains(evt.pos())
+        ):
+            if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
                 self.middleClicked.emit(evt.globalPos())
             else:
                 self.clicked.emit(evt.globalPos())
         elif (
-            evt.button() == Qt.MidButton and
+            evt.button() == Qt.MouseButton.MidButton and
             self.rect().contains(evt.pos())
         ):
             self.middleClicked.emit(evt.globalPos())
--- a/eric6/E5Gui/E5ComboSelectionDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ComboSelectionDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -53,7 +53,8 @@
         @param txt text of the selected entry
         @type str
         """
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(bool(txt))
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(bool(txt))
     
     def getSelection(self):
         """
--- a/eric6/E5Gui/E5Completers.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5Completers.py	Tue Mar 02 17:17:09 2021 +0100
@@ -20,7 +20,7 @@
     Class implementing a completer for file names.
     """
     def __init__(self, parent=None,
-                 completionMode=QCompleter.PopupCompletion,
+                 completionMode=QCompleter.CompletionMode.PopupCompletion,
                  showHidden=False):
         """
         Constructor
@@ -34,17 +34,23 @@
         super(E5FileCompleter, self).__init__(parent)
         self.__model = QFileSystemModel(self)
         if showHidden:
-            self.__model.setFilter(
-                QDir.Filters(QDir.Dirs | QDir.Files | QDir.Drives |
-                             QDir.AllDirs | QDir.Hidden))
+            self.__model.setFilter(QDir.Filters(
+                QDir.Filter.Dirs |
+                QDir.Filter.Files |
+                QDir.Filter.Drives |
+                QDir.Filter.AllDirs |
+                QDir.Filter.Hidden))
         else:
             self.__model.setFilter(QDir.Filters(
-                QDir.Dirs | QDir.Files | QDir.Drives | QDir.AllDirs))
+                QDir.Filter.Dirs |
+                QDir.Filter.Files |
+                QDir.Filter.Drives |
+                QDir.Filter.AllDirs))
         self.__model.setRootPath("")
         self.setModel(self.__model)
         self.setCompletionMode(completionMode)
         if isWindowsPlatform():
-            self.setCaseSensitivity(Qt.CaseInsensitive)
+            self.setCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
         if parent:
             parent.setCompleter(self)
     
@@ -74,7 +80,7 @@
     Class implementing a completer for directory names.
     """
     def __init__(self, parent=None,
-                 completionMode=QCompleter.PopupCompletion,
+                 completionMode=QCompleter.CompletionMode.PopupCompletion,
                  showHidden=False):
         """
         Constructor
@@ -88,16 +94,18 @@
         super(E5DirCompleter, self).__init__(parent)
         self.__model = QFileSystemModel(self)
         if showHidden:
-            self.__model.setFilter(
-                QDir.Filters(QDir.Drives | QDir.AllDirs | QDir.Hidden))
+            self.__model.setFilter(QDir.Filters(
+                QDir.Filter.Drives |
+                QDir.Filter.AllDirs |
+                QDir.Filter.Hidden))
         else:
             self.__model.setFilter(
-                QDir.Filters(QDir.Drives | QDir.AllDirs))
+                QDir.Filters(QDir.Filter.Drives | QDir.Filter.AllDirs))
         self.__model.setRootPath("")
         self.setModel(self.__model)
         self.setCompletionMode(completionMode)
         if isWindowsPlatform():
-            self.setCaseSensitivity(Qt.CaseInsensitive)
+            self.setCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
         if parent:
             parent.setCompleter(self)
     
@@ -127,7 +135,7 @@
     Class implementing a completer for string lists.
     """
     def __init__(self, parent=None, strings=None,
-                 completionMode=QCompleter.PopupCompletion):
+                 completionMode=QCompleter.CompletionMode.PopupCompletion):
         """
         Constructor
         
--- a/eric6/E5Gui/E5ErrorMessage.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ErrorMessage.py	Tue Mar 02 17:17:09 2021 +0100
@@ -24,8 +24,8 @@
 _origMsgHandler = None
 
 _filterSettings = QSettings(
-    QSettings.IniFormat,
-    QSettings.UserScope,
+    QSettings.Format.IniFormat,
+    QSettings.Scope.UserScope,
     Globals.settingsNameOrganization,
     "eric6messagefilters")
 _defaultFilters = [
@@ -96,7 +96,7 @@
             Globals.toList(_filterSettings.value(
                 "MessageFilters", _defaultFilters)),
             _defaultFilters)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             filters = dlg.getFilters()
             _filterSettings.setValue("MessageFilters", filters)
 
@@ -151,7 +151,7 @@
                 QMetaObject.invokeMethod(
                     _msgHandlerDialog,
                     "showMessage",
-                    Qt.QueuedConnection,
+                    Qt.ConnectionType.QueuedConnection,
                     Q_ARG(str, msg))
             return
         except RuntimeError:
--- a/eric6/E5Gui/E5FileDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5FileDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -15,14 +15,14 @@
 Options = QFileDialog.Options
 Option = QFileDialog.Option
 
-ShowDirsOnly = QFileDialog.ShowDirsOnly
-DontResolveSymlinks = QFileDialog.DontResolveSymlinks
-DontConfirmOverwrite = QFileDialog.DontConfirmOverwrite
-DontUseNativeDialog = QFileDialog.DontUseNativeDialog
-ReadOnly = QFileDialog.ReadOnly
-HideNameFilterDetails = QFileDialog.HideNameFilterDetails
-DontUseSheet = QFileDialog.DontUseSheet
-DontUseCustomDirectoryIcons = QFileDialog.DontUseCustomDirectoryIcons
+ShowDirsOnly = QFileDialog.Option.ShowDirsOnly
+DontResolveSymlinks = QFileDialog.Option.DontResolveSymlinks
+DontConfirmOverwrite = QFileDialog.Option.DontConfirmOverwrite
+DontUseNativeDialog = QFileDialog.Option.DontUseNativeDialog
+ReadOnly = QFileDialog.Option.ReadOnly
+HideNameFilterDetails = QFileDialog.Option.HideNameFilterDetails
+DontUseSheet = QFileDialog.Option.DontUseSheet
+DontUseCustomDirectoryIcons = QFileDialog.Option.DontUseCustomDirectoryIcons
 
 
 def __reorderFilter(filterStr, initialFilter=""):
@@ -59,7 +59,7 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -82,7 +82,7 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileName(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -103,7 +103,7 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -127,7 +127,7 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -148,7 +148,7 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getSaveFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -171,14 +171,15 @@
     if options is None:
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getSaveFileName(
         parent, caption, directory, newfilter, initialFilter, options)
 
 
 def getExistingDirectory(parent=None, caption="",
-                         directory="", options=QFileDialog.ShowDirsOnly):
+                         directory="",
+                         options=QFileDialog.Option.ShowDirsOnly):
     """
     Module function to get the name of a directory.
     
@@ -189,6 +190,6 @@
     @return name of selected directory (string)
     """
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getExistingDirectory(parent, caption, directory,
                                             options)
--- a/eric6/E5Gui/E5FileSaveConfirmDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5FileSaveConfirmDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -59,11 +59,11 @@
         
         self.__buttonBox = QDialogButtonBox(self)
         self.__cancelButton = self.__buttonBox.addButton(
-            QDialogButtonBox.Cancel)
+            QDialogButtonBox.StandardButton.Cancel)
         self.__overwriteButton = self.__buttonBox.addButton(
-            self.tr("Overwrite"), QDialogButtonBox.AcceptRole)
+            self.tr("Overwrite"), QDialogButtonBox.ButtonRole.AcceptRole)
         self.__renameButton = self.__buttonBox.addButton(
-            self.tr("Rename"), QDialogButtonBox.AcceptRole)
+            self.tr("Rename"), QDialogButtonBox.ButtonRole.AcceptRole)
         
         self.__layout.addWidget(self.__label)
         self.__layout.addWidget(self.__pathPicker)
--- a/eric6/E5Gui/E5GenericDiffHighlighter.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5GenericDiffHighlighter.py	Tue Mar 02 17:17:09 2021 +0100
@@ -112,7 +112,7 @@
             charFormat.setBackground(bg)
         
         if bold:
-            charFormat.setFontWeight(QFont.Bold)
+            charFormat.setFontWeight(QFont.Weight.Bold)
         
         return charFormat
     
--- a/eric6/E5Gui/E5Led.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5Led.py	Tue Mar 02 17:17:09 2021 +0100
@@ -85,15 +85,16 @@
         gradient.setColorAt(0.6, color)
         if self.__framedLed:
             gradient.setColorAt(0.9, color.darker())
-            gradient.setColorAt(1.0, self.palette().color(QPalette.Dark))
+            gradient.setColorAt(
+                1.0, self.palette().color(QPalette.ColorRole.Dark))
         else:
             gradient.setColorAt(1.0, color.darker())
         
         # now do the drawing
         paint = QPainter(self)
-        paint.setRenderHint(QPainter.Antialiasing, True)
+        paint.setRenderHint(QPainter.RenderHint.Antialiasing, True)
         paint.setBrush(QBrush(gradient))
-        paint.setPen(Qt.NoPen)
+        paint.setPen(Qt.PenStyle.NoPen)
         paint.drawEllipse(1, 1, width, width)
         paint.end()
         
@@ -109,14 +110,14 @@
         
         # now do the drawing
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing, True)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing, True)
         color = self.__led_on and self.__led_color or self.__offcolor
 
         painter.setPen(color.lighter(200))
         painter.drawLine(left, 0, left, height - 1)
         painter.drawLine(left + 1, 0, right - 1, 0)
         if self.__framedLed:
-            painter.setPen(self.palette().color(QPalette.Dark))
+            painter.setPen(self.palette().color(QPalette.ColorRole.Dark))
         else:
             painter.setPen(color.darker())
         painter.drawLine(left + 1, height - 1, right - 1, height - 1)
@@ -295,7 +296,7 @@
         """
         super(E5ClickableLed, self).__init__(parent, color, shape, rectRatio)
         
-        self.setCursor(Qt.PointingHandCursor)
+        self.setCursor(Qt.CursorShape.PointingHandCursor)
     
     def mouseReleaseEvent(self, evt):
         """
@@ -303,13 +304,16 @@
         
         @param evt mouse event (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton and self.rect().contains(evt.pos()):
-            if evt.modifiers() == Qt.ControlModifier:
+        if (
+            evt.button() == Qt.MouseButton.LeftButton and
+            self.rect().contains(evt.pos())
+        ):
+            if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
                 self.middleClicked.emit(evt.globalPos())
             else:
                 self.clicked.emit(evt.globalPos())
         elif (
-            evt.button() == Qt.MidButton and
+            evt.button() == Qt.MouseButton.MidButton and
             self.rect().contains(evt.pos())
         ):
             self.middleClicked.emit(evt.globalPos())
--- a/eric6/E5Gui/E5LineEdit.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5LineEdit.py	Tue Mar 02 17:17:09 2021 +0100
@@ -39,7 +39,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, whether the event was recognized (boolean)
         """
-        if evt.type() == QEvent.LayoutRequest:
+        if evt.type() == QEvent.Type.LayoutRequest:
             self.sizeHintChanged.emit()
         return QWidget.event(self, evt)
 
@@ -74,31 +74,34 @@
         self.__leftLayout = QHBoxLayout(self.__leftWidget)
         self.__leftLayout.setContentsMargins(0, 0, 2, 0)
         if QApplication.isRightToLeft():
-            self.__leftLayout.setDirection(QBoxLayout.RightToLeft)
+            self.__leftLayout.setDirection(QBoxLayout.Direction.RightToLeft)
         else:
-            self.__leftLayout.setDirection(QBoxLayout.LeftToRight)
-        self.__leftLayout.setSizeConstraint(QLayout.SetFixedSize)
+            self.__leftLayout.setDirection(QBoxLayout.Direction.LeftToRight)
+        self.__leftLayout.setSizeConstraint(
+            QLayout.SizeConstraint.SetFixedSize)
         
         self.__rightWidget = E5LineEditSideWidget(self)
         self.__rightWidget.resize(0, 0)
         self.__rightLayout = QHBoxLayout(self.__rightWidget)
         self.__rightLayout.setContentsMargins(0, 0, 2, 0)
         if self.isRightToLeft():
-            self.__rightLayout.setDirection(QBoxLayout.RightToLeft)
+            self.__rightLayout.setDirection(QBoxLayout.Direction.RightToLeft)
         else:
-            self.__rightLayout.setDirection(QBoxLayout.LeftToRight)
+            self.__rightLayout.setDirection(QBoxLayout.Direction.LeftToRight)
         
         horizontalSpacer = QSpacerItem(
-            0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         self.__mainLayout.addWidget(
-            self.__leftWidget, 0, Qt.AlignVCenter | Qt.AlignLeft)
+            self.__leftWidget, 0,
+            Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignLeft)
         self.__mainLayout.addItem(horizontalSpacer)
         self.__mainLayout.addWidget(
-            self.__rightWidget, 0, Qt.AlignVCenter | Qt.AlignRight)
+            self.__rightWidget, 0,
+            Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignRight)
         if self.isRightToLeft():
-            self.__mainLayout.setDirection(QBoxLayout.RightToLeft)
+            self.__mainLayout.setDirection(QBoxLayout.Direction.RightToLeft)
         else:
-            self.__mainLayout.setDirection(QBoxLayout.LeftToRight)
+            self.__mainLayout.setDirection(QBoxLayout.Direction.LeftToRight)
         
         self.setWidgetSpacing(3)
         self.__leftWidget.sizeHintChanged.connect(self._updateTextMargins)
@@ -127,15 +130,21 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, whether the event was recognized (boolean)
         """
-        if evt.type() == QEvent.LayoutDirectionChange:
+        if evt.type() == QEvent.Type.LayoutDirectionChange:
             if self.isRightToLeft():
-                self.__mainLayout.setDirection(QBoxLayout.RightToLeft)
-                self.__leftLayout.setDirection(QBoxLayout.RightToLeft)
-                self.__rightLayout.setDirection(QBoxLayout.RightToLeft)
+                self.__mainLayout.setDirection(
+                    QBoxLayout.Direction.RightToLeft)
+                self.__leftLayout.setDirection(
+                    QBoxLayout.Direction.RightToLeft)
+                self.__rightLayout.setDirection(
+                    QBoxLayout.Direction.RightToLeft)
             else:
-                self.__mainLayout.setDirection(QBoxLayout.LeftToRight)
-                self.__leftLayout.setDirection(QBoxLayout.LeftToRight)
-                self.__rightLayout.setDirection(QBoxLayout.LeftToRight)
+                self.__mainLayout.setDirection(
+                    QBoxLayout.Direction.LeftToRight)
+                self.__leftLayout.setDirection(
+                    QBoxLayout.Direction.LeftToRight)
+                self.__rightLayout.setDirection(
+                    QBoxLayout.Direction.LeftToRight)
         return QLineEdit.event(self, evt)
     
     def _updateTextMargins(self):
--- a/eric6/E5Gui/E5LineEditButton.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5LineEditButton.py	Tue Mar 02 17:17:09 2021 +0100
@@ -27,8 +27,8 @@
         self.__menu = None
         self.__image = None
         
-        self.setFocusPolicy(Qt.NoFocus)
-        self.setCursor(Qt.ArrowCursor)
+        self.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        self.setCursor(Qt.CursorShape.ArrowCursor)
         self.setMinimumSize(16, 16)
         
         self.clicked.connect(self.__clicked)
@@ -90,7 +90,7 @@
             triagPath.lineTo(startPos.x() + 4, startPos.y())
             triagPath.lineTo(startPos.x() + 2, startPos.y() + 2)
             triagPath.closeSubpath()
-            painter.setPen(Qt.black)
-            painter.setBrush(Qt.black)
-            painter.setRenderHint(QPainter.Antialiasing, False)
+            painter.setPen(Qt.GlobalColor.black)
+            painter.setBrush(Qt.GlobalColor.black)
+            painter.setRenderHint(QPainter.RenderHint.Antialiasing, False)
             painter.drawPath(triagPath)
--- a/eric6/E5Gui/E5ListSelectionDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ListSelectionDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -20,7 +20,8 @@
     Class implementing a dialog to select from a list of strings.
     """
     def __init__(self, entries,
-                 selectionMode=QAbstractItemView.ExtendedSelection,
+                 selectionMode=QAbstractItemView.SelectionMode
+                 .ExtendedSelection,
                  title="", message="", checkBoxSelection=False, parent=None):
         """
         Constructor
@@ -50,17 +51,20 @@
         self.__checkCount = 0
         self.__isCheckBoxSelection = checkBoxSelection
         if self.__isCheckBoxSelection:
-            self.selectionList.setSelectionMode(QAbstractItemView.NoSelection)
+            self.selectionList.setSelectionMode(
+                QAbstractItemView.SelectionMode.NoSelection)
             for entry in entries:
                 itm = QListWidgetItem(entry)
-                itm.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
-                itm.setCheckState(Qt.Unchecked)
+                itm.setFlags(Qt.ItemFlag.ItemIsUserCheckable |
+                             Qt.ItemFlag.ItemIsEnabled)
+                itm.setCheckState(Qt.CheckState.Unchecked)
                 self.selectionList.addItem(itm)
         else:
             self.selectionList.setSelectionMode(selectionMode)
             self.selectionList.addItems(entries)
         
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
     
     @pyqtSlot()
     def on_selectionList_itemSelectionChanged(self):
@@ -68,8 +72,9 @@
         Private slot handling a change of the selection.
         """
         if not self.__isCheckBoxSelection:
-            self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
-                len(self.selectionList.selectedItems()) > 0)
+            self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Ok).setEnabled(
+                    len(self.selectionList.selectedItems()) > 0)
     
     def on_selectionList_itemChanged(self, itm):
         """
@@ -79,11 +84,12 @@
         @type QListWidgetItem
         """
         if self.__isCheckBoxSelection:
-            if itm.checkState() == Qt.Checked:
+            if itm.checkState() == Qt.CheckState.Checked:
                 self.__checkCount += 1
             else:
                 self.__checkCount -= 1
-            self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
+            self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Ok).setEnabled(
                 self.__checkCount > 0)
     
     def getSelection(self):
@@ -97,7 +103,7 @@
         if self.__isCheckBoxSelection:
             for row in range(self.selectionList.count()):
                 item = self.selectionList.item(row)
-                if item.checkState() == Qt.Checked:
+                if item.checkState() == Qt.CheckState.Checked:
                     entries.append(item.text())
         else:
             for item in self.selectionList.selectedItems():
--- a/eric6/E5Gui/E5ListView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ListView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -22,7 +22,7 @@
         @param evt reference to the event (QKeyEvent)
         """
         if (
-            evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and
+            evt.key() in [Qt.Key.Key_Delete, Qt.Key.Key_Backspace] and
             self.model() is not None
         ):
             self.removeSelected()
@@ -49,7 +49,8 @@
             idx = self.model().index(row - 1, 0, self.rootIndex())
         self.selectionModel().select(
             idx,
-            QItemSelectionModel.SelectCurrent | QItemSelectionModel.Rows)
+            QItemSelectionModel.SelectionFlag.SelectCurrent |
+            QItemSelectionModel.SelectionFlag.Rows)
         self.setCurrentIndex(idx)
     
     def removeAll(self):
--- a/eric6/E5Gui/E5MapWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5MapWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -23,7 +23,7 @@
         @param parent reference to the parent widget (QWidget)
         """
         super(E5MapWidget, self).__init__(parent)
-        self.setAttribute(Qt.WA_OpaquePaintEvent)
+        self.setAttribute(Qt.WidgetAttribute.WA_OpaquePaintEvent)
         
         self.__width = 14
         self.__lineBorder = 1
@@ -45,10 +45,10 @@
         """
         if self.__backgroundColor.toHsv().value() < 128:
             # dark background, use white slider
-            self.__sliderColor = Qt.white
+            self.__sliderColor = Qt.GlobalColor.white
         else:
             # light background, use black slider
-            self.__sliderColor = Qt.black
+            self.__sliderColor = Qt.GlobalColor.black
     
     def __updateMasterViewportWidth(self):
         """
@@ -71,7 +71,8 @@
         @param master map master widget (QAbstractScrollArea)
         """
         self._master = master
-        self._master.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
+        self._master.setVerticalScrollBarPolicy(
+            Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
         self._master.verticalScrollBar().valueChanged.connect(self.update)
         self._master.verticalScrollBar().rangeChanged.connect(self.update)
         self.__updateMasterViewportWidth()
@@ -203,7 +204,7 @@
         if self._master:
             penColor = self.__sliderColor
             painter.setPen(penColor)
-            brushColor = Qt.transparent
+            brushColor = Qt.GlobalColor.transparent
             painter.setBrush(QBrush(brushColor))
             painter.drawRect(self.__generateSliderRange(
                 self._master.verticalScrollBar()))
@@ -224,7 +225,7 @@
         
         @param event reference to the mouse event (QMouseEvent)
         """
-        if event.button() == Qt.LeftButton and self._master:
+        if event.button() == Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
             value = self.position2Value(event.pos().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page
@@ -236,7 +237,7 @@
         
         @param event reference to the mouse event (QMouseEvent)
         """
-        if event.buttons() & Qt.LeftButton and self._master:
+        if event.buttons() & Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
             value = self.position2Value(event.pos().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page
@@ -250,7 +251,7 @@
         isVertical = event.angleDelta().x() == 0
         if (
             self._master and
-            event.modifiers() == Qt.NoModifier and
+            event.modifiers() == Qt.KeyboardModifier.NoModifier and
             isVertical
         ):
             QCoreApplication.sendEvent(self._master.verticalScrollBar(), event)
--- a/eric6/E5Gui/E5MessageBox.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5MessageBox.py	Tue Mar 02 17:17:09 2021 +0100
@@ -15,46 +15,46 @@
 ###############################################################################
 
 # QMessageBox.Icon
-NoIcon = QMessageBox.NoIcon
-Critical = QMessageBox.Critical
-Information = QMessageBox.Information
-Question = QMessageBox.Question
-Warning = QMessageBox.Warning       # __IGNORE_WARNING_M131__
+NoIcon = QMessageBox.Icon.NoIcon
+Critical = QMessageBox.Icon.Critical
+Information = QMessageBox.Icon.Information
+Question = QMessageBox.Icon.Question
+Warning = QMessageBox.Icon.Warning       # __IGNORE_WARNING_M131__
 
 StandardButtons = QMessageBox.StandardButtons
 
 # QMessageBox.StandardButton
-Abort = QMessageBox.Abort
-Apply = QMessageBox.Apply
-Cancel = QMessageBox.Cancel
-Close = QMessageBox.Close
-Discard = QMessageBox.Discard
-Help = QMessageBox.Help
-Ignore = QMessageBox.Ignore
-No = QMessageBox.No
-NoToAll = QMessageBox.NoToAll
-Ok = QMessageBox.Ok
-Open = QMessageBox.Open
-Reset = QMessageBox.Reset
-RestoreDefaults = QMessageBox.RestoreDefaults
-Retry = QMessageBox.Retry
-Save = QMessageBox.Save
-SaveAll = QMessageBox.SaveAll
-Yes = QMessageBox.Yes
-YesToAll = QMessageBox.YesToAll
-NoButton = QMessageBox.NoButton
+Abort = QMessageBox.StandardButton.Abort
+Apply = QMessageBox.StandardButton.Apply
+Cancel = QMessageBox.StandardButton.Cancel
+Close = QMessageBox.StandardButton.Close
+Discard = QMessageBox.StandardButton.Discard
+Help = QMessageBox.StandardButton.Help
+Ignore = QMessageBox.StandardButton.Ignore
+No = QMessageBox.StandardButton.No
+NoToAll = QMessageBox.StandardButton.NoToAll
+Ok = QMessageBox.StandardButton.Ok
+Open = QMessageBox.StandardButton.Open
+Reset = QMessageBox.StandardButton.Reset
+RestoreDefaults = QMessageBox.StandardButton.RestoreDefaults
+Retry = QMessageBox.StandardButton.Retry
+Save = QMessageBox.StandardButton.Save
+SaveAll = QMessageBox.StandardButton.SaveAll
+Yes = QMessageBox.StandardButton.Yes
+YesToAll = QMessageBox.StandardButton.YesToAll
+NoButton = QMessageBox.StandardButton.NoButton
 
 # QMessageBox.ButtonRole
-AcceptRole = QMessageBox.AcceptRole
-ActionRole = QMessageBox.ActionRole
-ApplyRole = QMessageBox.ApplyRole
-DestructiveRole = QMessageBox.DestructiveRole
-InvalidRole = QMessageBox.InvalidRole
-HelpRole = QMessageBox.HelpRole
-NoRole = QMessageBox.NoRole
-RejectRole = QMessageBox.RejectRole
-ResetRole = QMessageBox.ResetRole
-YesRole = QMessageBox.YesRole
+AcceptRole = QMessageBox.ButtonRole.AcceptRole
+ActionRole = QMessageBox.ButtonRole.ActionRole
+ApplyRole = QMessageBox.ButtonRole.ApplyRole
+DestructiveRole = QMessageBox.ButtonRole.DestructiveRole
+InvalidRole = QMessageBox.ButtonRole.InvalidRole
+HelpRole = QMessageBox.ButtonRole.HelpRole
+NoRole = QMessageBox.ButtonRole.NoRole
+RejectRole = QMessageBox.ButtonRole.RejectRole
+ResetRole = QMessageBox.ButtonRole.ResetRole
+YesRole = QMessageBox.ButtonRole.YesRole
 
 ###############################################################################
 ##  Replacement for the QMessageBox class                                    ##
@@ -66,7 +66,7 @@
     Class implementing a replacement for QMessageBox.
     """
     def __init__(self, icon, title, text, modal=False,
-                 buttons=QMessageBox.NoButton,
+                 buttons=QMessageBox.StandardButton.NoButton,
                  parent=None):
         """
         Constructor
@@ -82,11 +82,11 @@
         self.setIcon(icon)
         if modal:
             if parent is not None:
-                self.setWindowModality(Qt.WindowModal)
+                self.setWindowModality(Qt.WindowModality.WindowModal)
             else:
-                self.setWindowModality(Qt.ApplicationModal)
+                self.setWindowModality(Qt.WindowModality.ApplicationModal)
         else:
-            self.setWindowModality(Qt.NonModal)
+            self.setWindowModality(Qt.WindowModality.NonModal)
         if title == "":
             self.setWindowTitle("{0}".format(
                 QApplication.applicationName()))
@@ -102,8 +102,9 @@
 
 
 def __messageBox(parent, title, text, icon,
-                 buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton,
-                 textFormat=Qt.AutoText):
+                 buttons=QMessageBox.StandardButton.Ok,
+                 defaultButton=QMessageBox.StandardButton.NoButton,
+                 textFormat=Qt.TextFormat.AutoText):
     """
     Private module function to show a modal message box.
     
@@ -121,7 +122,7 @@
     messageBox = QMessageBox(parent)
     messageBox.setIcon(icon)
     if parent is not None:
-        messageBox.setWindowModality(Qt.WindowModal)
+        messageBox.setWindowModality(Qt.WindowModality.WindowModal)
     if title == "":
         messageBox.setWindowTitle("{0}".format(
             QApplication.applicationName()))
@@ -135,7 +136,7 @@
     messageBox.exec()
     clickedButton = messageBox.clickedButton()
     if clickedButton is None:
-        return QMessageBox.NoButton
+        return QMessageBox.StandardButton.NoButton
     else:
         return messageBox.standardButton(clickedButton)
 
@@ -145,7 +146,8 @@
 
 
 def critical(parent, title, text,
-             buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton):
+             buttons=QMessageBox.StandardButton.Ok,
+             defaultButton=QMessageBox.StandardButton.NoButton):
     """
     Function to show a modal critical message box.
     
@@ -158,12 +160,13 @@
         (QMessageBox.StandardButton)
     @return button pressed by the user (QMessageBox.StandardButton)
     """
-    return __messageBox(parent, title, text, QMessageBox.Critical,
+    return __messageBox(parent, title, text, QMessageBox.Icon.Critical,
                         buttons, defaultButton)
 
 
 def information(parent, title, text,
-                buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton):
+                buttons=QMessageBox.StandardButton.Ok,
+                defaultButton=QMessageBox.StandardButton.NoButton):
     """
     Function to show a modal information message box.
     
@@ -176,12 +179,13 @@
         (QMessageBox.StandardButton)
     @return button pressed by the user (QMessageBox.StandardButton)
     """
-    return __messageBox(parent, title, text, QMessageBox.Information,
+    return __messageBox(parent, title, text, QMessageBox.Icon.Information,
                         buttons, defaultButton)
 
 
 def question(parent, title, text,
-             buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton):
+             buttons=QMessageBox.StandardButton.Ok,
+             defaultButton=QMessageBox.StandardButton.NoButton):
     """
     Function to show a modal question message box.
     
@@ -194,12 +198,13 @@
         (QMessageBox.StandardButton)
     @return button pressed by the user (QMessageBox.StandardButton)
     """
-    return __messageBox(parent, title, text, QMessageBox.Question,
+    return __messageBox(parent, title, text, QMessageBox.Icon.Question,
                         buttons, defaultButton)
 
 
 def warning(parent, title, text,
-            buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton):
+            buttons=QMessageBox.StandardButton.Ok,
+            defaultButton=QMessageBox.StandardButton.NoButton):
     """
     Function to show a modal warning message box.
     
@@ -212,7 +217,7 @@
         (QMessageBox.StandardButton)
     @return button pressed by the user (QMessageBox.StandardButton)
     """
-    return __messageBox(parent, title, text, QMessageBox.Warning,
+    return __messageBox(parent, title, text, QMessageBox.Icon.Warning,
                         buttons, defaultButton)
 
 ###############################################################################
@@ -221,7 +226,7 @@
 
 
 def yesNo(parent, title, text, icon=Question, yesDefault=False,
-          textFormat=Qt.AutoText):
+          textFormat=Qt.TextFormat.AutoText):
     """
     Function to show a model yes/no message box.
     
@@ -241,13 +246,16 @@
     
     res = __messageBox(
         parent, title, text, icon,
-        QMessageBox.StandardButtons(QMessageBox.Yes | QMessageBox.No),
-        yesDefault and QMessageBox.Yes or QMessageBox.No,
+        QMessageBox.StandardButtons(QMessageBox.StandardButton.Yes |
+                                    QMessageBox.StandardButton.No),
+        yesDefault and QMessageBox.StandardButton.Yes or
+        QMessageBox.StandardButton.No,
         textFormat)
-    return res == QMessageBox.Yes
+    return res == QMessageBox.StandardButton.Yes
 
 
-def retryAbort(parent, title, text, icon=Question, textFormat=Qt.AutoText):
+def retryAbort(parent, title, text, icon=Question,
+               textFormat=Qt.TextFormat.AutoText):
     """
     Function to show a model abort/retry message box.
     
@@ -265,13 +273,15 @@
     
     res = __messageBox(
         parent, title, text, icon,
-        QMessageBox.StandardButtons(QMessageBox.Retry | QMessageBox.Abort),
-        QMessageBox.Retry,
+        QMessageBox.StandardButtons(QMessageBox.StandardButton.Retry |
+                                    QMessageBox.StandardButton.Abort),
+        QMessageBox.StandardButton.Retry,
         textFormat)
-    return res == QMessageBox.Retry
+    return res == QMessageBox.StandardButton.Retry
 
 
-def okToClearData(parent, title, text, saveFunc, textFormat=Qt.AutoText):
+def okToClearData(parent, title, text, saveFunc,
+                  textFormat=Qt.TextFormat.AutoText):
     """
     Function to show a model message box to ask for clearing the data.
     
@@ -284,13 +294,15 @@
     @return flag indicating that it is ok to clear the data (boolean)
     """
     res = __messageBox(
-        parent, title, text, QMessageBox.Warning,
+        parent, title, text, QMessageBox.Icon.Warning,
         QMessageBox.StandardButtons(
-            QMessageBox.Abort | QMessageBox.Discard | QMessageBox.Save),
-        QMessageBox.Save,
+            QMessageBox.StandardButton.Abort |
+            QMessageBox.StandardButton.Discard |
+            QMessageBox.StandardButton.Save),
+        QMessageBox.StandardButton.Save,
         textFormat)
-    if res == QMessageBox.Abort:
+    if res == QMessageBox.StandardButton.Abort:
         return False
-    if res == QMessageBox.Save:
+    if res == QMessageBox.StandardButton.Save:
         return saveFunc()
     return True
--- a/eric6/E5Gui/E5ModelMenu.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ModelMenu.py	Tue Mar 02 17:17:09 2021 +0100
@@ -41,8 +41,9 @@
         
         self.setAcceptDrops(True)
         
-        self._mouseButton = Qt.NoButton
-        self._keyboardModifiers = Qt.KeyboardModifiers(Qt.NoModifier)
+        self._mouseButton = Qt.MouseButton.NoButton
+        self._keyboardModifiers = Qt.KeyboardModifiers(
+            Qt.KeyboardModifier.NoModifier)
         self.__dropRow = -1
         self.__dropIndex = None
         
@@ -203,7 +204,7 @@
             modelMenu.triggered.disconnect(modelMenu.__actionTriggered)
             modelMenu.setTitle(title)
             
-            icon = parent.data(Qt.DecorationRole)
+            icon = parent.data(Qt.ItemDataRole.DecorationRole)
             if icon == NotImplemented or icon is None:
                 icon = UI.PixmapCache.getIcon("defaultIcon")
             modelMenu.setIcon(icon)
@@ -243,7 +244,7 @@
         @param idx index of the item to create an action for (QModelIndex)
         @return reference to the created action (QAction)
         """
-        icon = idx.data(Qt.DecorationRole)
+        icon = idx.data(Qt.ItemDataRole.DecorationRole)
         if icon == NotImplemented or icon is None:
             icon = UI.PixmapCache.getIcon("defaultIcon")
         action = self.makeAction(icon, idx.data(), self)
@@ -269,7 +270,8 @@
                 self.__maxWidth = fm.horizontalAdvance("m") * 30
             except AttributeError:
                 self.__maxWidth = fm.width('m') * 30
-        smallText = fm.elidedText(text, Qt.ElideMiddle, self.__maxWidth)
+        smallText = fm.elidedText(text, Qt.TextElideMode.ElideMiddle,
+                                  self.__maxWidth)
         
         return QAction(icon, smallText, parent)
     
@@ -354,7 +356,7 @@
         
         @param evt reference to the event object (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton:
+        if evt.button() == Qt.MouseButton.LeftButton:
             self.__dragStartPosition = evt.pos()
         super(E5ModelMenu, self).mousePressEvent(evt)
     
@@ -368,7 +370,7 @@
             super(E5ModelMenu, self).mouseMoveEvent(evt)
             return
         
-        if not (evt.buttons() & Qt.LeftButton):
+        if not (evt.buttons() & Qt.MouseButton.LeftButton):
             super(E5ModelMenu, self).mouseMoveEvent(evt)
             return
         
@@ -397,7 +399,7 @@
         actionRect = self.actionGeometry(act)
         drag.setPixmap(self.grab(actionRect))
         
-        if drag.exec() == Qt.MoveAction:
+        if drag.exec() == Qt.DropAction.MoveAction:
             row = idx.row()
             if self.__dropIndex == idx.parent() and self.__dropRow <= row:
                 row += 1
@@ -417,7 +419,7 @@
         self._mouseButton = evt.button()
         self._keyboardModifiers = evt.modifiers()
         
-        if evt.button() == Qt.LeftButton:
+        if evt.button() == Qt.MouseButton.LeftButton:
             self.__dragStartPosition = QPoint()
         
         super(E5ModelMenu, self).mouseReleaseEvent(evt)
@@ -426,8 +428,9 @@
         """
         Public method to reset the saved internal state.
         """
-        self._mouseButton = Qt.NoButton
-        self._keyboardModifiers = Qt.KeyboardModifiers(Qt.NoModifier)
+        self._mouseButton = Qt.MouseButton.NoButton
+        self._keyboardModifiers = Qt.KeyboardModifiers(
+            Qt.KeyboardModifier.NoModifier)
     
     def removeEntry(self, idx):
         """
--- a/eric6/E5Gui/E5ModelToolBar.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ModelToolBar.py	Tue Mar 02 17:17:09 2021 +0100
@@ -42,8 +42,9 @@
         
         self.setAcceptDrops(True)
         
-        self._mouseButton = Qt.NoButton
-        self._keyboardModifiers = Qt.KeyboardModifiers(Qt.NoModifier)
+        self._mouseButton = Qt.MouseButton.NoButton
+        self._keyboardModifiers = Qt.KeyboardModifiers(
+            Qt.KeyboardModifier.NoModifier)
         self.__dropRow = -1
         self.__dropIndex = None
     
@@ -109,8 +110,8 @@
         for i in range(self.__model.rowCount(self.__root)):
             idx = self.__model.index(i, 0, self.__root)
             
-            title = idx.data(Qt.DisplayRole)
-            icon = idx.data(Qt.DecorationRole)
+            title = idx.data(Qt.ItemDataRole.DisplayRole)
+            icon = idx.data(Qt.ItemDataRole.DecorationRole)
             if icon == NotImplemented or icon is None:
                 icon = QIcon()
             folder = self.__model.hasChildren(idx)
@@ -126,8 +127,10 @@
                 menu.setModel(self.__model)
                 menu.setRootIndex(idx)
                 act.setMenu(menu)
-                button.setPopupMode(QToolButton.InstantPopup)
-                button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+                button.setPopupMode(
+                    QToolButton.ToolButtonPopupMode.InstantPopup)
+                button.setToolButtonStyle(
+                    Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
     
     def index(self, action):
         """
@@ -165,15 +168,15 @@
         @param evt reference to the event (QEvent)
         @return flag indicating that the event should be filtered out (boolean)
         """
-        if evt.type() == QEvent.MouseButtonRelease:
+        if evt.type() == QEvent.Type.MouseButtonRelease:
             self._mouseButton = evt.button()
             self._keyboardModifiers = evt.modifiers()
             act = obj.defaultAction()
             idx = self.index(act)
             if idx.isValid():
                 self.activated[QModelIndex].emit(idx)
-        elif evt.type() == QEvent.MouseButtonPress:
-            if evt.buttons() & Qt.LeftButton:
+        elif evt.type() == QEvent.Type.MouseButtonPress:
+            if evt.buttons() & Qt.MouseButton.LeftButton:
                 self.__dragStartPosition = self.mapFromGlobal(evt.globalPos())
         
         return False
@@ -232,7 +235,7 @@
             super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return
         
-        if not (evt.buttons() & Qt.LeftButton):
+        if not (evt.buttons() & Qt.MouseButton.LeftButton):
             super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return
         
@@ -256,7 +259,7 @@
         actionRect = self.actionGeometry(act)
         drag.setPixmap(self.grab(actionRect))
         
-        if drag.exec() == Qt.MoveAction:
+        if drag.exec() == Qt.DropAction.MoveAction:
             row = idx.row()
             if self.__dropIndex == idx.parent() and self.__dropRow <= row:
                 row += 1
@@ -285,5 +288,6 @@
         """
         Public method to reset the saved internal state.
         """
-        self._mouseButton = Qt.NoButton
-        self._keyboardModifiers = Qt.KeyboardModifiers(Qt.NoModifier)
+        self._mouseButton = Qt.MouseButton.NoButton
+        self._keyboardModifiers = Qt.KeyboardModifiers(
+            Qt.KeyboardModifier.NoModifier)
--- a/eric6/E5Gui/E5OverrideCursor.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5OverrideCursor.py	Tue Mar 02 17:17:09 2021 +0100
@@ -18,7 +18,7 @@
     """
     Class implementing a context manager class for an override cursor.
     """
-    def __init__(self, cursorShape=Qt.WaitCursor):
+    def __init__(self, cursorShape=Qt.CursorShape.WaitCursor):
         """
         Constructor
         
@@ -35,7 +35,8 @@
         @rtype E5OverrideCursor
         """
         QGuiApplication.setOverrideCursor(QCursor(self.__cursorShape))
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         return self
     
@@ -51,7 +52,8 @@
         @rtype None
         """
         QGuiApplication.restoreOverrideCursor()
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         return None     # __IGNORE_WARNING_M831__
 
@@ -80,7 +82,8 @@
         if cursor is not None:
             self.__cursorShape = cursor.shape()
             QGuiApplication.restoreOverrideCursor()
-            QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+            QGuiApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         return self
     
@@ -97,7 +100,8 @@
         """
         if self.__cursorShape is not None:
             QGuiApplication.setOverrideCursor(QCursor(self.__cursorShape))
-            QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+            QGuiApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         return None     # __IGNORE_WARNING_M831__
 
@@ -106,7 +110,7 @@
     """
     Class implementing a QProcess subclass controlling an override cursor.
     """
-    def __init__(self, parent=None, cursorShape=Qt.WaitCursor):
+    def __init__(self, parent=None, cursorShape=Qt.CursorShape.WaitCursor):
         """
         Constructor
         
@@ -128,7 +132,8 @@
         Private slot setting the cursor after the process has started.
         """
         QGuiApplication.setOverrideCursor(QCursor(self.__cursorShape))
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
     
     @pyqtSlot()
     def __processFinished(self):
@@ -136,4 +141,5 @@
         Private slot resetting the cursor when the process finished.
         """
         QGuiApplication.restoreOverrideCursor()
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
--- a/eric6/E5Gui/E5PassivePopup.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5PassivePopup.py	Tue Mar 02 17:17:09 2021 +0100
@@ -41,7 +41,7 @@
         self.__fixedPosition = QPoint()
         
         self.setWindowFlags(POPUP_FLAGS)
-        self.setFrameStyle(QFrame.Box | QFrame.Plain)
+        self.setFrameStyle(QFrame.Shape.Box | QFrame.Shadow.Plain)
         self.setLineWidth(2)
         self.__hideTimer.timeout.connect(self.hide)
         self.clicked.connect(self.hide)
@@ -235,5 +235,5 @@
 DEFAULT_POPUP_TYPE = E5PassivePopup.Boxed
 DEFAULT_POPUP_TIME = 6 * 1000
 POPUP_FLAGS = Qt.WindowFlags(
-    Qt.Tool | Qt.X11BypassWindowManagerHint |
-    Qt.WindowStaysOnTopHint | Qt.FramelessWindowHint)
+    Qt.WindowType.Tool | Qt.WindowType.X11BypassWindowManagerHint |
+    Qt.WindowType.WindowStaysOnTopHint | Qt.WindowType.FramelessWindowHint)
--- a/eric6/E5Gui/E5PathPicker.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5PathPicker.py	Tue Mar 02 17:17:09 2021 +0100
@@ -96,7 +96,7 @@
                     "E5PathPickerBase", "Enter Path Name"))
         
         self.__button = QToolButton(self)
-        self.__button.setToolButtonStyle(Qt.ToolButtonIconOnly)
+        self.__button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.__button.setIcon(UI.PixmapCache.getIcon("open"))
         
         self.__layout.addWidget(self._editor)
@@ -110,8 +110,9 @@
             self._editor.editTextChanged.connect(self.editTextChanged)
         
         self.setFocusProxy(self._editor)
-        self.setFocusPolicy(Qt.StrongFocus)
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding,
+                           QSizePolicy.Policy.Preferred)
         
         self.__button.setEnabled(self.__mode != E5PathPickerModes.NoMode)
     
--- a/eric6/E5Gui/E5PathPickerDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5PathPickerDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -35,7 +35,8 @@
         
         self.__pathPicker = E5PathPicker(self)
         self.__buttonBox = QDialogButtonBox(
-            QDialogButtonBox.Cancel | QDialogButtonBox.Ok, self)
+            QDialogButtonBox.StandardButton.Cancel |
+            QDialogButtonBox.StandardButton.Ok, self)
         
         self.__layout.addWidget(self.__label)
         self.__layout.addWidget(self.__pathPicker)
@@ -150,7 +151,7 @@
         dlg.setPickerFilters(";;".join(filters))
     
     # step 2: show the dialog and get the result
-    if dlg.exec() == QDialog.Accepted:
+    if dlg.exec() == QDialog.DialogCode.Accepted:
         ok = True
         path = dlg.getPath().strip()
     else:
--- a/eric6/E5Gui/E5PlainTextDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5PlainTextDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -33,7 +33,8 @@
         self.setupUi(self)
         
         self.copyButton = self.buttonBox.addButton(
-            self.tr("Copy to Clipboard"), QDialogButtonBox.ActionRole)
+            self.tr("Copy to Clipboard"),
+            QDialogButtonBox.ButtonRole.ActionRole)
         self.copyButton.clicked.connect(self.on_copyButton_clicked)
         
         self.setWindowTitle(title)
--- a/eric6/E5Gui/E5ProcessDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ProcessDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -48,8 +48,10 @@
         super(E5ProcessDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         font = Preferences.getEditorOtherFonts("MonospacedFont")
         self.resultbox.setFontFamily(font.family())
@@ -77,7 +79,7 @@
         """
         if (
             self.__process is not None and
-            self.__process.state() != QProcess.NotRunning
+            self.__process.state() != QProcess.ProcessState.NotRunning
         ):
             self.__process.terminate()
             QTimer.singleShot(2000, self.__process.kill)
@@ -88,11 +90,15 @@
         
         self.__process = None
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
-        self.buttonBox.button(QDialogButtonBox.Close).setFocus(
-            Qt.OtherFocusReason)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setFocus(
+            Qt.FocusReason.OtherFocusReason)
     
     def on_buttonBox_clicked(self, button):
         """
@@ -101,9 +107,13 @@
         @param button button that was clicked
         @type QAbstractButton
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.close()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.statusLabel.setText(self.tr("Process canceled."))
             self.__finish()
     
@@ -116,10 +126,13 @@
         @param exitStatus exit status of the process
         @type QProcess.ExitStatus
         """
-        self.__normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0)
+        self.__normal = (
+            (exitStatus == QProcess.ExitStatus.NormalExit) and
+            (exitCode == 0)
+        )
         if self.__normal:
             self.statusLabel.setText(self.tr("Process finished successfully."))
-        elif exitStatus == QProcess.CrashExit:
+        elif exitStatus == QProcess.ExitStatus.CrashExit:
             self.statusLabel.setText(self.tr("Process crashed."))
         else:
             self.statusLabel.setText(
@@ -256,9 +269,9 @@
         @type bool
         """
         if isOn:
-            self.input.setEchoMode(QLineEdit.Password)
+            self.input.setEchoMode(QLineEdit.EchoMode.Password)
         else:
-            self.input.setEchoMode(QLineEdit.Normal)
+            self.input.setEchoMode(QLineEdit.EchoMode.Normal)
     
     @pyqtSlot()
     def on_sendButton_clicked(self):
--- a/eric6/E5Gui/E5SideBar.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5SideBar.py	Tue Mar 02 17:17:09 2021 +0100
@@ -45,7 +45,7 @@
         
         self.__tabBar = QTabBar()
         self.__tabBar.setDrawBase(True)
-        self.__tabBar.setShape(QTabBar.RoundedNorth)
+        self.__tabBar.setShape(QTabBar.Shape.RoundedNorth)
         self.__tabBar.setUsesScrollButtons(True)
         self.__tabBar.setDrawBase(False)
         self.__stackedWidget = QStackedWidget(self)
@@ -57,9 +57,9 @@
         self.__autoHideButton.setChecked(True)
         self.__autoHideButton.setToolTip(
             self.tr("Deselect to activate automatic collapsing"))
-        self.barLayout = QBoxLayout(QBoxLayout.LeftToRight)
+        self.barLayout = QBoxLayout(QBoxLayout.Direction.LeftToRight)
         self.barLayout.setContentsMargins(0, 0, 0, 0)
-        self.layout = QBoxLayout(QBoxLayout.TopToBottom)
+        self.layout = QBoxLayout(QBoxLayout.Direction.TopToBottom)
         self.layout.setContentsMargins(0, 0, 0, 0)
         self.layout.setSpacing(0)
         self.barLayout.addWidget(self.__autoHideButton)
@@ -239,7 +239,7 @@
         @return flag indicating, if the event was handled (boolean)
         """
         if obj == self.__tabBar:
-            if evt.type() == QEvent.MouseButtonPress:
+            if evt.type() == QEvent.Type.MouseButtonPress:
                 pos = evt.pos()
                 for i in range(self.__tabBar.count()):
                     if self.__tabBar.tabRect(i).contains(pos):
@@ -253,7 +253,7 @@
                     return True
                 elif self.isMinimized():
                     self.expand()
-            elif evt.type() == QEvent.Wheel:
+            elif evt.type() == QEvent.Type.Wheel:
                 delta = evt.angleDelta().y()
                 if delta > 0:
                     self.prevTab()
@@ -439,33 +439,35 @@
         @param orient orientation of the sidebar (North, East, South, West)
         """
         if orient == E5SideBar.North:
-            self.__tabBar.setShape(QTabBar.RoundedNorth)
+            self.__tabBar.setShape(QTabBar.Shape.RoundedNorth)
             self.__tabBar.setSizePolicy(
-                QSizePolicy.Expanding, QSizePolicy.Preferred)
-            self.barLayout.setDirection(QBoxLayout.LeftToRight)
-            self.layout.setDirection(QBoxLayout.TopToBottom)
-            self.layout.setAlignment(self.barLayout, Qt.AlignLeft)
+                QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+            self.barLayout.setDirection(QBoxLayout.Direction.LeftToRight)
+            self.layout.setDirection(QBoxLayout.Direction.TopToBottom)
+            self.layout.setAlignment(self.barLayout,
+                                     Qt.AlignmentFlag.AlignLeft)
         elif orient == E5SideBar.East:
-            self.__tabBar.setShape(QTabBar.RoundedEast)
+            self.__tabBar.setShape(QTabBar.Shape.RoundedEast)
             self.__tabBar.setSizePolicy(
-                QSizePolicy.Preferred, QSizePolicy.Expanding)
-            self.barLayout.setDirection(QBoxLayout.TopToBottom)
-            self.layout.setDirection(QBoxLayout.RightToLeft)
-            self.layout.setAlignment(self.barLayout, Qt.AlignTop)
+                QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding)
+            self.barLayout.setDirection(QBoxLayout.Direction.TopToBottom)
+            self.layout.setDirection(QBoxLayout.Direction.RightToLeft)
+            self.layout.setAlignment(self.barLayout, Qt.AlignmentFlag.AlignTop)
         elif orient == E5SideBar.South:
-            self.__tabBar.setShape(QTabBar.RoundedSouth)
+            self.__tabBar.setShape(QTabBar.Shape.RoundedSouth)
             self.__tabBar.setSizePolicy(
-                QSizePolicy.Expanding, QSizePolicy.Preferred)
-            self.barLayout.setDirection(QBoxLayout.LeftToRight)
-            self.layout.setDirection(QBoxLayout.BottomToTop)
-            self.layout.setAlignment(self.barLayout, Qt.AlignLeft)
+                QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+            self.barLayout.setDirection(QBoxLayout.Direction.LeftToRight)
+            self.layout.setDirection(QBoxLayout.Direction.BottomToTop)
+            self.layout.setAlignment(self.barLayout,
+                                     Qt.AlignmentFlag.AlignLeft)
         elif orient == E5SideBar.West:
-            self.__tabBar.setShape(QTabBar.RoundedWest)
+            self.__tabBar.setShape(QTabBar.Shape.RoundedWest)
             self.__tabBar.setSizePolicy(
-                QSizePolicy.Preferred, QSizePolicy.Expanding)
-            self.barLayout.setDirection(QBoxLayout.TopToBottom)
-            self.layout.setDirection(QBoxLayout.LeftToRight)
-            self.layout.setAlignment(self.barLayout, Qt.AlignTop)
+                QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding)
+            self.barLayout.setDirection(QBoxLayout.Direction.TopToBottom)
+            self.layout.setDirection(QBoxLayout.Direction.LeftToRight)
+            self.layout.setAlignment(self.barLayout, Qt.AlignmentFlag.AlignTop)
         self.__orientation = orient
     
     def tabIcon(self, index):
@@ -567,8 +569,8 @@
                 self.__maxSize = self.maximumWidth()
         
         data = QByteArray()
-        stream = QDataStream(data, QIODevice.WriteOnly)
-        stream.setVersion(QDataStream.Qt_4_6)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
+        stream.setVersion(QDataStream.Version.Qt_4_6)
         
         stream.writeUInt16(self.Version)
         stream.writeBool(self.__minimized)
@@ -600,8 +602,8 @@
             maxSize = self.maximumWidth()
         
         data = QByteArray(state)
-        stream = QDataStream(data, QIODevice.ReadOnly)
-        stream.setVersion(QDataStream.Qt_4_6)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.ReadOnly)
+        stream.setVersion(QDataStream.Version.Qt_4_6)
         version = stream.readUInt16()  # version
         minimized = stream.readBool()
         
--- a/eric6/E5Gui/E5SimpleHelpDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5SimpleHelpDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -32,7 +32,7 @@
         """
         super(E5SimpleHelpDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.setWindowTitle(title)
         if label:
--- a/eric6/E5Gui/E5SqueezeLabels.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5SqueezeLabels.py	Tue Mar 02 17:17:09 2021 +0100
@@ -42,7 +42,7 @@
             pixelLength = fm.width(self.__text)
         if pixelLength > self.contentsRect().width():
             self.__elided = fm.elidedText(
-                self.text(), Qt.ElideMiddle, self.width())
+                self.text(), Qt.TextElideMode.ElideMiddle, self.width())
             super(E5SqueezeLabel, self).setText(self.__elided)
         else:
             super(E5SqueezeLabel, self).setText(self.__text)
--- a/eric6/E5Gui/E5StringListEditWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5StringListEditWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -34,7 +34,8 @@
         
         self.__model = QStringListModel(self)
         self.__proxyModel = QSortFilterProxyModel(self)
-        self.__proxyModel.setFilterCaseSensitivity(Qt.CaseInsensitive)
+        self.__proxyModel.setFilterCaseSensitivity(
+            Qt.CaseSensitivity.CaseInsensitive)
         self.__proxyModel.setSourceModel(self.__model)
         self.stringList.setModel(self.__proxyModel)
         
@@ -100,7 +101,7 @@
             self,
             self.tr("Add Entry"),
             self.tr("Enter the entry to add to the list:"),
-            QLineEdit.Normal)
+            QLineEdit.EchoMode.Normal)
         if ok and entry != "" and entry not in self.__model.stringList():
             self.__model.insertRow(self.__model.rowCount())
             self.__model.setData(
--- a/eric6/E5Gui/E5TabWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TabWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -72,7 +72,7 @@
         
         @param event reference to the mouse press event (QMouseEvent)
         """
-        if event.button() == Qt.LeftButton:
+        if event.button() == Qt.MouseButton.LeftButton:
             self.__dragStartPos = QPoint(event.pos())
         E5WheelTabBar.mousePressEvent(self, event)
     
@@ -83,7 +83,7 @@
         @param event reference to the mouse move event (QMouseEvent)
         """
         if (
-            event.buttons() == Qt.MouseButtons(Qt.LeftButton) and
+            event.buttons() == Qt.MouseButtons(Qt.MouseButton.LeftButton) and
             (event.pos() - self.__dragStartPos).manhattanLength() >
             QApplication.startDragDistance()
         ):
@@ -233,7 +233,7 @@
         @param policy context menu policy to set (Qt.ContextMenuPolicy)
         """
         self.tabBar().setContextMenuPolicy(policy)
-        if policy == Qt.CustomContextMenu:
+        if policy == Qt.ContextMenuPolicy.CustomContextMenu:
             self.tabBar().customContextMenuRequested.connect(
                 self.__handleTabCustomContextMenuRequested)
         else:
@@ -304,12 +304,12 @@
         @return free side (QTabBar.ButtonPosition)
         """
         side = self.__tabBar.style().styleHint(
-            QStyle.SH_TabBar_CloseButtonPosition,
+            QStyle.StyleHint.SH_TabBar_CloseButtonPosition,
             None, None, None)
-        if side == QTabBar.LeftSide:
-            side = QTabBar.RightSide
+        if side == QTabBar.ButtonPosition.LeftSide:
+            side = QTabBar.ButtonPosition.RightSide
         else:
-            side = QTabBar.LeftSide
+            side = QTabBar.ButtonPosition.LeftSide
         return side
     
     def animationLabel(self, index, animationFile, interval=100):
--- a/eric6/E5Gui/E5TableView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TableView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -22,7 +22,7 @@
         @param evt reference to the event (QKeyEvent)
         """
         if (
-            evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and
+            evt.key() in [Qt.Key.Key_Delete, Qt.Key.Key_Backspace] and
             self.model() is not None
         ):
             self.removeSelected()
@@ -49,7 +49,8 @@
             idx = self.model().index(row - 1, 0, self.rootIndex())
         self.selectionModel().select(
             idx,
-            QItemSelectionModel.SelectCurrent | QItemSelectionModel.Rows)
+            QItemSelectionModel.SelectionFlag.SelectCurrent |
+            QItemSelectionModel.SelectionFlag.Rows)
         self.setCurrentIndex(idx)
     
     def removeAll(self):
--- a/eric6/E5Gui/E5TextEditSearchWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TextEditSearchWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -42,10 +42,12 @@
         self.__findBackwards = True
         
         self.__defaultBaseColor = (
-            self.findtextCombo.lineEdit().palette().color(QPalette.Base)
+            self.findtextCombo.lineEdit().palette().color(
+                QPalette.ColorRole.Base)
         )
         self.__defaultTextColor = (
-            self.findtextCombo.lineEdit().palette().color(QPalette.Text)
+            self.findtextCombo.lineEdit().palette().color(
+                QPalette.ColorRole.Text)
         )
         
         self.findHistory = []
@@ -82,7 +84,8 @@
         self.horizontalLayout1.addWidget(self.label)
         
         self.findtextCombo = E5ClearableComboBox(self)
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding,
+                                 QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(
@@ -90,7 +93,7 @@
         self.findtextCombo.setSizePolicy(sizePolicy)
         self.findtextCombo.setMinimumSize(QSize(100, 0))
         self.findtextCombo.setEditable(True)
-        self.findtextCombo.setInsertPolicy(QComboBox.InsertAtTop)
+        self.findtextCombo.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
         self.findtextCombo.setDuplicatesEnabled(False)
         self.findtextCombo.setObjectName("findtextCombo")
         self.horizontalLayout1.addWidget(self.findtextCombo)
@@ -200,8 +203,8 @@
         
         @param event reference to the key press event (QKeyEvent)
         """
-        if self.__textedit and event.key() == Qt.Key_Escape:
-            self.__textedit.setFocus(Qt.ActiveWindowFocusReason)
+        if self.__textedit and event.key() == Qt.Key.Key_Escape:
+            self.__textedit.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
             event.accept()
     
     @pyqtSlot(str)
@@ -289,22 +292,25 @@
         @rtype bool
         """
         if backwards:
-            flags = QTextDocument.FindFlags(QTextDocument.FindBackward)
+            flags = QTextDocument.FindFlags(
+                QTextDocument.FindFlag.FindBackward)
         else:
             flags = QTextDocument.FindFlags()
         if self.caseCheckBox.isChecked():
-            flags |= QTextDocument.FindCaseSensitively
+            flags |= QTextDocument.FindFlag.FindCaseSensitively
         if self.wordCheckBox.isChecked():
-            flags |= QTextDocument.FindWholeWords
+            flags |= QTextDocument.FindFlag.FindWholeWords
         
         ok = self.__textedit.find(self.findtextCombo.currentText(), flags)
         if not ok:
             # wrap around once
             cursor = self.__textedit.textCursor()
             if backwards:
-                moveOp = QTextCursor.End        # move to end of document
+                moveOp = QTextCursor.MoveOperation.End
+                # move to end of document
             else:
-                moveOp = QTextCursor.Start      # move to start of document
+                moveOp = QTextCursor.MoveOperation.Start
+                # move to start of document
             cursor.movePosition(moveOp)
             self.__textedit.setTextCursor(cursor)
             ok = self.__textedit.find(self.findtextCombo.currentText(), flags)
@@ -323,9 +329,9 @@
         
         findFlags = QWebEnginePage.FindFlags()
         if self.caseCheckBox.isChecked():
-            findFlags |= QWebEnginePage.FindCaseSensitively
+            findFlags |= QWebEnginePage.FindFlag.FindCaseSensitively
         if backwards:
-            findFlags |= QWebEnginePage.FindBackward
+            findFlags |= QWebEnginePage.FindFlag.FindBackward
         self.__textedit.findText(self.findtextCombo.currentText(),
                                  findFlags, self.__findNextPrevCallback)
     
@@ -353,10 +359,10 @@
         le = self.findtextCombo.lineEdit()
         p = le.palette()
         if error:
-            p.setBrush(QPalette.Base, QBrush(QColor("#FF6666")))
-            p.setBrush(QPalette.Text, QBrush(QColor("#000000")))
+            p.setBrush(QPalette.ColorRole.Base, QBrush(QColor("#FF6666")))
+            p.setBrush(QPalette.ColorRole.Text, QBrush(QColor("#000000")))
         else:
-            p.setBrush(QPalette.Base, self.__defaultBaseColor)
-            p.setBrush(QPalette.Text, self.__defaultTextColor)
+            p.setBrush(QPalette.ColorRole.Base, self.__defaultBaseColor)
+            p.setBrush(QPalette.ColorRole.Text, self.__defaultTextColor)
         le.setPalette(p)
         le.update()
--- a/eric6/E5Gui/E5TextInputDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TextInputDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -38,7 +38,8 @@
         self.__layout.addWidget(self.__lineEdit)
         
         self.__buttonBox = QDialogButtonBox(
-            QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
+            QDialogButtonBox.StandardButton.Ok |
+            QDialogButtonBox.StandardButton.Cancel, self)
         self.__layout.addWidget(self.__buttonBox)
         
         self.__buttonBox.accepted.connect(self.accept)
@@ -107,7 +108,7 @@
         return self.label.text()
 
 
-def getText(parent, title, label, mode=QLineEdit.Normal, text="",
+def getText(parent, title, label, mode=QLineEdit.EchoMode.Normal, text="",
             minimumWidth=300):
     """
     Function to get create a dialog to enter some text and return it.
@@ -135,7 +136,7 @@
     dlg.setTextValue(text)
     dlg.setMinimumWidth(minimumWidth)
     
-    if dlg.exec() == QDialog.Accepted:
+    if dlg.exec() == QDialog.DialogCode.Accepted:
         return True, dlg.textValue()
     else:
         return False, ""
--- a/eric6/E5Gui/E5ToolBarDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ToolBarDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -45,8 +45,8 @@
     """
     Class implementing a toolbar configuration dialog.
     """
-    ActionIdRole = Qt.UserRole
-    WidgetActionRole = Qt.UserRole + 1
+    ActionIdRole = Qt.ItemDataRole.UserRole
+    WidgetActionRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, toolBarManager, parent=None):
         """
@@ -77,8 +77,9 @@
         self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
         
         self.__restoreDefaultsButton = self.buttonBox.button(
-            QDialogButtonBox.RestoreDefaults)
-        self.__resetButton = self.buttonBox.button(QDialogButtonBox.Reset)
+            QDialogButtonBox.StandardButton.RestoreDefaults)
+        self.__resetButton = self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Reset)
         
         self.actionsTree.header().hide()
         self.__separatorText = self.tr("--Separator--")
@@ -91,12 +92,16 @@
                 item = QTreeWidgetItem(categoryItem)
                 item.setText(0, action.text())
                 item.setIcon(0, action.icon())
-                item.setTextAlignment(0, Qt.AlignLeft | Qt.AlignVCenter)
+                item.setTextAlignment(
+                    0,
+                    Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter
+                )
                 item.setData(0, E5ToolBarDialog.ActionIdRole, int(id(action)))
                 item.setData(0, E5ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(0, E5ToolBarDialog.WidgetActionRole, True)
-                    item.setData(0, Qt.TextColorRole, QColor(Qt.blue))
+                    item.setData(0, Qt.ItemDataRole.TextColorRole,
+                                 QColor(Qt.GlobalColor.blue))
                     self.__widgetActionToToolBarItemID[id(action)] = None
             categoryItem.setExpanded(True)
         
@@ -122,7 +127,8 @@
             if default:
                 self.toolbarComboBox.setItemData(
                     self.toolbarComboBox.count() - 1,
-                    QColor(Qt.darkGreen), Qt.ForegroundRole)
+                    QColor(Qt.GlobalColor.darkGreen),
+                    Qt.ItemDataRole.ForegroundRole)
         self.toolbarComboBox.model().sort(0)
         
         self.toolbarComboBox.currentIndexChanged[int].connect(
@@ -138,7 +144,7 @@
             self,
             self.tr("New Toolbar"),
             self.tr("Toolbar Name:"),
-            QLineEdit.Normal)
+            QLineEdit.EchoMode.Normal)
         if ok and name:
             if self.toolbarComboBox.findText(name) != -1:
                 # toolbar with this name already exists
@@ -198,7 +204,7 @@
             self,
             self.tr("Rename Toolbar"),
             self.tr("New Toolbar Name:"),
-            QLineEdit.Normal,
+            QLineEdit.EchoMode.Normal,
             oldName)
         if ok and newName:
             if oldName == newName:
@@ -264,12 +270,14 @@
                 action = self.__manager.actionById(actionID)
                 item.setText(action.text())
                 item.setIcon(action.icon())
-                item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
+                item.setTextAlignment(Qt.AlignmentFlag.AlignLeft |
+                                      Qt.AlignmentFlag.AlignVCenter)
                 item.setData(E5ToolBarDialog.ActionIdRole, int(id(action)))
                 item.setData(E5ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(E5ToolBarDialog.WidgetActionRole, True)
-                    item.setData(Qt.TextColorRole, QColor(Qt.blue))
+                    item.setData(Qt.ItemDataRole.TextColorRole,
+                                 QColor(Qt.GlobalColor.blue))
         self.toolbarActionsList.setCurrentRow(0)
         
         self.__setupButtons()
@@ -366,12 +374,14 @@
             action = self.__manager.actionById(actionID)
             item.setText(action.text())
             item.setIcon(action.icon())
-            item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
+            item.setTextAlignment(Qt.AlignmentFlag.AlignLeft |
+                                  Qt.AlignmentFlag.AlignVCenter)
             item.setData(E5ToolBarDialog.ActionIdRole, int(id(action)))
             item.setData(E5ToolBarDialog.WidgetActionRole, False)
             if self.__manager.isWidgetAction(action):
                 item.setData(E5ToolBarDialog.WidgetActionRole, True)
-                item.setData(Qt.TextColorRole, QColor(Qt.blue))
+                item.setData(Qt.ItemDataRole.TextColorRole,
+                             QColor(Qt.GlobalColor.blue))
                 oldTbItemID = self.__widgetActionToToolBarItemID[actionID]
                 if oldTbItemID is not None:
                     self.__toolbarItems[oldTbItemID].actionIDs.remove(actionID)
@@ -395,18 +405,28 @@
         
         @param button reference to the button clicked (QAbstractButton)
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.reject()
-        elif button == self.buttonBox.button(QDialogButtonBox.Apply):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Apply
+        ):
             self.__saveToolBars()
             self.__setupButtons()
-        elif button == self.buttonBox.button(QDialogButtonBox.Ok):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok
+        ):
             self.__saveToolBars()
             self.accept()
-        elif button == self.buttonBox.button(QDialogButtonBox.Reset):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Reset
+        ):
             self.__resetCurrentToolbar()
             self.__setupButtons()
-        elif button == self.buttonBox.button(QDialogButtonBox.RestoreDefaults):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.RestoreDefaults
+        ):
             self.__restoreCurrentToolbarToDefault()
             self.__setupButtons()
     
--- a/eric6/E5Gui/E5ToolBarManager.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ToolBarManager.py	Tue Mar 02 17:17:09 2021 +0100
@@ -483,8 +483,8 @@
         @return saved state as a byte array (QByteArray)
         """
         data = QByteArray()
-        stream = QDataStream(data, QIODevice.WriteOnly)
-        stream.setVersion(QDataStream.Qt_4_6)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
+        stream.setVersion(QDataStream.Version.Qt_4_6)
         stream.writeUInt16(E5ToolBarManager.VersionMarker)
         stream.writeUInt16(version)
         
@@ -540,8 +540,8 @@
             return False
         
         data = QByteArray(state)
-        stream = QDataStream(data, QIODevice.ReadOnly)
-        stream.setVersion(QDataStream.Qt_4_6)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.ReadOnly)
+        stream.setVersion(QDataStream.Version.Qt_4_6)
         marker = stream.readUInt16()
         vers = stream.readUInt16()
         if marker != E5ToolBarManager.VersionMarker or vers != version:
--- a/eric6/E5Gui/E5ToolBox.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ToolBox.py	Tue Mar 02 17:17:09 2021 +0100
@@ -37,7 +37,7 @@
         @param parent reference to the parent widget (QWidget)
         """
         E5TabWidget.__init__(self, parent)
-        self.setTabPosition(QTabWidget.West)
+        self.setTabPosition(QTabWidget.TabPosition.West)
         self.setUsesScrollButtons(True)
     
     def addItem(self, widget, icon, text):
--- a/eric6/E5Gui/E5ToolButton.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5ToolButton.py	Tue Mar 02 17:17:09 2021 +0100
@@ -63,7 +63,7 @@
         self.__pressTimer.setSingleShot(True)
         self.__pressTimer.setInterval(
             QApplication.style().styleHint(
-                QStyle.SH_ToolButton_PopupDelay, opt, self))
+                QStyle.StyleHint.SH_ToolButton_PopupDelay, opt, self))
         self.__pressTimer.timeout.connect(self.__showMenu)
     
     ##################################################################
@@ -131,7 +131,10 @@
         
         if self.__options & E5ToolButton.ShowMenuInsideOption:
             pos = self.mapToGlobal(self.rect().bottomRight())
-            if QApplication.layoutDirection() == Qt.RightToLeft:
+            if (
+                QApplication.layoutDirection() ==
+                Qt.LayoutDirection.RightToLeft
+            ):
                 pos.setX(pos.x() - self.rect().width())
             else:
                 pos.setX(pos.x() - self.__menu.sizeHint().width())
@@ -174,7 +177,7 @@
             opt = QStyleOption()
             opt.initFrom(self)
             size = self.style().pixelMetric(
-                QStyle.PM_ToolBarIconSize, opt, self)
+                QStyle.PixelMetric.PM_ToolBarIconSize, opt, self)
             self.setIconSize(QSize(size, size))
         else:
             self.__options &= ~E5ToolButton.ToolBarLookOption
@@ -194,18 +197,18 @@
         @param evt reference to the mouse event
         @type QMouseEvent
         """
-        if self.popupMode() == QToolButton.DelayedPopup:
+        if self.popupMode() == QToolButton.ToolButtonPopupMode.DelayedPopup:
             self.__pressTimer.start()
         
         if (
-            evt.buttons() == Qt.LeftButton and
+            evt.buttons() == Qt.MouseButton.LeftButton and
             self.__menu is not None and
-            self.popupMode() == QToolButton.InstantPopup
+            self.popupMode() == QToolButton.ToolButtonPopupMode.InstantPopup
         ):
             self.setDown(True)
             self.__showMenu()
         elif (
-            evt.buttons() == Qt.RightButton and
+            evt.buttons() == Qt.MouseButton.RightButton and
             self.__menu is not None
         ):
             self.setDown(True)
@@ -223,15 +226,15 @@
         self.__pressTimer.stop()
         
         if (
-            evt.button() == Qt.MiddleButton and
+            evt.button() == Qt.MouseButton.MiddleButton and
             self.rect().contains(evt.pos())
         ):
             self.middleClicked.emit()
             self.setDown(False)
         elif (
-            evt.button() == Qt.LeftButton and
+            evt.button() == Qt.MouseButton.LeftButton and
             self.rect().contains(evt.pos()) and
-            evt.modifiers() == Qt.ControlModifier
+            evt.modifiers() == Qt.KeyboardModifier.ControlModifier
         ):
             self.controlClicked.emit()
             self.setDown(False)
@@ -249,7 +252,7 @@
         
         self.__pressTimer.stop()
         
-        if evt.buttons() == Qt.LeftButton:
+        if evt.buttons() == Qt.MouseButton.LeftButton:
             self.doubleClicked.emit()
     
     def contextMenuEvent(self, evt):
--- a/eric6/E5Gui/E5TreeSortFilterProxyModel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TreeSortFilterProxyModel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -25,7 +25,7 @@
         """
         super(E5TreeSortFilterProxyModel, self).__init__(parent)
         
-        self.setFilterCaseSensitivity(Qt.CaseInsensitive)
+        self.setFilterCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
     
     def filterAcceptsRow(self, sourceRow, sourceParent):
         """
--- a/eric6/E5Gui/E5TreeView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TreeView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -22,7 +22,7 @@
         @param evt reference to the event (QKeyEvent)
         """
         if (
-            evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and
+            evt.key() in [Qt.Key.Key_Delete, Qt.Key.Key_Backspace] and
             self.model() is not None
         ):
             self.removeSelected()
--- a/eric6/E5Gui/E5TreeWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5TreeWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -38,7 +38,7 @@
         self.__allTreeItems = []
         self.__showMode = E5TreeWidget.ItemsCollapsed
         
-        self.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
+        self.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
         
         self.itemChanged.connect(self.__scheduleRefresh)
     
@@ -84,7 +84,7 @@
                 return False
             parentItem = parent
         elif isinstance(parent, str):
-            lst = self.findItems(parent, Qt.MatchExactly)
+            lst = self.findItems(parent, Qt.MatchFlag.MatchExactly)
             if not lst:
                 return False
             parentItem = lst[0]
@@ -113,7 +113,7 @@
                 return False
             parentItem = parent
         elif isinstance(parent, str):
-            lst = self.findItems(parent, Qt.MatchExactly)
+            lst = self.findItems(parent, Qt.MatchFlag.MatchExactly)
             if not lst:
                 return False
             parentItem = lst[0]
@@ -249,12 +249,12 @@
         @param evt mouse press event (QMouseEvent)
         """
         if (
-            evt.modifiers() == Qt.ControlModifier and
-            evt.buttons() == Qt.LeftButton
+            evt.modifiers() == Qt.KeyboardModifier.ControlModifier and
+            evt.buttons() == Qt.MouseButton.LeftButton
         ):
             self.itemControlClicked.emit(self.itemAt(evt.pos()))
             return
-        elif evt.buttons() == Qt.MidButton:
+        elif evt.buttons() == Qt.MouseButton.MidButton:
             self.itemMiddleButtonClicked.emit(self.itemAt(evt.pos()))
             return
         else:
--- a/eric6/E5Network/E5GoogleMail.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5GoogleMail.py	Tue Mar 02 17:17:09 2021 +0100
@@ -55,7 +55,8 @@
         self.__browser.loadFinished.connect(self.__pageLoadFinished)
         self.__layout.addWidget(self.__browser)
         
-        self.__buttonBox = QDialogButtonBox(QDialogButtonBox.Close)
+        self.__buttonBox = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Close)
         self.__buttonBox.rejected.connect(self.reject)
         self.__layout.addWidget(self.__buttonBox)
         
@@ -81,7 +82,7 @@
                 "https://accounts.google.com/o/oauth2/approval/v2"):
             urlQuery = QUrlQuery(url)
             approvalCode = urlQuery.queryItemValue(
-                "approvalCode", QUrl.FullyDecoded)
+                "approvalCode", QUrl.ComponentFormattingOption.FullyDecoded)
             if approvalCode:
                 self.approvalCodeReceived.emit(approvalCode)
                 self.close()
--- a/eric6/E5Network/E5NetworkHeaderDetailsDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5NetworkHeaderDetailsDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -25,7 +25,7 @@
         """
         super(E5NetworkHeaderDetailsDialog, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
     
     def setData(self, name, value):
         """
--- a/eric6/E5Network/E5NetworkProxyFactory.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5NetworkProxyFactory.py	Tue Mar 02 17:17:09 2021 +0100
@@ -31,13 +31,13 @@
     @return scheme (string, one of Http, Https, Ftp)
     """
     scheme = ""
-    if proxyType == QNetworkProxy.HttpProxy:
+    if proxyType == QNetworkProxy.ProxyType.HttpProxy:
         scheme = "Http"
-    elif proxyType == QNetworkProxy.HttpCachingProxy:
+    elif proxyType == QNetworkProxy.ProxyType.HttpCachingProxy:
         scheme = "Https"
-    elif proxyType == QNetworkProxy.FtpCachingProxy:
+    elif proxyType == QNetworkProxy.ProxyType.FtpCachingProxy:
         scheme = "Ftp"
-    elif proxyType == QNetworkProxy.NoProxy:
+    elif proxyType == QNetworkProxy.ProxyType.NoProxy:
         scheme = "NoProxy"
     return scheme
 
@@ -57,7 +57,7 @@
     from UI.AuthenticationDialog import AuthenticationDialog
     dlg = AuthenticationDialog(info, proxy.user(), True)
     dlg.setData(proxy.user(), proxy.password())
-    if dlg.exec() == QDialog.Accepted:
+    if dlg.exec() == QDialog.DialogCode.Accepted:
         username, password = dlg.getData()
         auth.setUser(username)
         auth.setPassword(password)
@@ -158,12 +158,12 @@
         @return list of proxies in order of preference (list of QNetworkProxy)
         """
         if (
-            query.queryType() == QNetworkProxyQuery.UrlRequest and
+            query.queryType() == QNetworkProxyQuery.QueryType.UrlRequest and
             query.protocolTag() in ["http", "https", "ftp"]
         ):
             # use proxy at all ?
             if not Preferences.getUI("UseProxy"):
-                return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             
             # test for exceptions
             exceptions = Preferences.getUI("ProxyExceptions")
@@ -172,7 +172,7 @@
             urlHost = query.url().host()
             for matcher in self.__hostnameMatchers:
                 if matcher.match(urlHost):
-                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                    return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             
             # determine proxy
             if Preferences.getUI("UseSystemProxy"):
@@ -180,7 +180,7 @@
                 if (
                     not Globals.isWindowsPlatform() and
                     len(proxyList) == 1 and
-                    proxyList[0].type() == QNetworkProxy.NoProxy
+                    proxyList[0].type() == QNetworkProxy.ProxyType.NoProxy
                 ):
                     # try it the Python way
                     # scan the environment for variables named <scheme>_proxy
@@ -194,11 +194,13 @@
                         ):
                             url = QUrl(value)
                             if url.scheme() in ["http", "https"]:
-                                proxyType = QNetworkProxy.HttpProxy
+                                proxyType = QNetworkProxy.ProxyType.HttpProxy
                             elif url.scheme() == "ftp":
-                                proxyType = QNetworkProxy.FtpCachingProxy
+                                proxyType = (
+                                    QNetworkProxy.ProxyType.FtpCachingProxy
+                                )
                             else:
-                                proxyType = QNetworkProxy.HttpProxy
+                                proxyType = QNetworkProxy.ProxyType.HttpProxy
                             proxy = QNetworkProxy(
                                 proxyType, url.host(), url.port(),
                                 url.userName(), url.password())
@@ -216,7 +218,7 @@
                                 "ProxyPassword/{0}".format(scheme)))
                     return proxyList
                 else:
-                    return [QNetworkProxy(QNetworkProxy.NoProxy)]
+                    return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
             else:
                 if Preferences.getUI("UseHttpProxyForAll"):
                     protocolKey = "Http"
@@ -234,20 +236,26 @@
                             """Proxy usage was activated"""
                             """ but no proxy host for protocol"""
                             """ '{0}' configured.""").format(protocolKey))
-                    return [QNetworkProxy(QNetworkProxy.DefaultProxy)]
+                    return [
+                        QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)
+                    ]
                 else:
                     if protocolKey in ["Http", "Https", "Ftp"]:
                         if query.protocolTag() == "ftp":
-                            proxyType = QNetworkProxy.FtpCachingProxy
+                            proxyType = QNetworkProxy.ProxyType.FtpCachingProxy
                         else:
-                            proxyType = QNetworkProxy.HttpProxy
+                            proxyType = QNetworkProxy.ProxyType.HttpProxy
                         proxy = QNetworkProxy(
                             proxyType, host,
                             Preferences.getUI("ProxyPort/" + protocolKey),
                             Preferences.getUI("ProxyUser/" + protocolKey),
                             Preferences.getUI("ProxyPassword/" + protocolKey))
                     else:
-                        proxy = QNetworkProxy(QNetworkProxy.DefaultProxy)
-                    return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)]
+                        proxy = QNetworkProxy(
+                            QNetworkProxy.ProxyType.DefaultProxy)
+                    return [
+                        proxy,
+                        QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)
+                    ]
         else:
-            return [QNetworkProxy(QNetworkProxy.NoProxy)]
+            return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -27,7 +27,7 @@
     """
     Class implementing a dialog to select a SSL certificate.
     """
-    CertRole = Qt.UserRole + 1
+    CertRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, certificates, parent=None):
         """
@@ -62,7 +62,7 @@
         self.certificatesTree.expandAll()
         for i in range(self.certificatesTree.columnCount()):
             self.certificatesTree.resizeColumnToContents(i)
-        self.certificatesTree.sortItems(0, Qt.AscendingOrder)
+        self.certificatesTree.sortItems(0, Qt.SortOrder.AscendingOrder)
     
     def __createCaCertificateEntry(self, cert):
         """
@@ -73,9 +73,11 @@
         """
         # step 1: extract the info to be shown
         organisation = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.Organization)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.Organization)))
         commonName = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.CommonName)))
         if organisation is None or organisation == "":
             organisation = self.tr("(Unknown)")
         if commonName is None or commonName == "":
@@ -85,7 +87,7 @@
         # step 2: create the entry
         items = self.certificatesTree.findItems(
             organisation,
-            Qt.MatchFixedString | Qt.MatchCaseSensitive)
+            Qt.MatchFlag.MatchFixedString | Qt.MatchFlag.MatchCaseSensitive)
         if len(items) == 0:
             parent = QTreeWidgetItem(self.certificatesTree, [organisation])
             parent.setFirstColumnSpanned(True)
--- a/eric6/E5Network/E5SslCertificatesDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5SslCertificatesDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -32,7 +32,7 @@
     """
     Class implementing a dialog to show and edit all certificates.
     """
-    CertRole = Qt.UserRole + 1
+    CertRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, parent=None):
         """
@@ -87,9 +87,11 @@
         """
         # step 1: extract the info to be shown
         organisation = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.Organization)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.Organization)))
         commonName = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.CommonName)))
         if organisation is None or organisation == "":
             organisation = self.tr("(Unknown)")
         if commonName is None or commonName == "":
@@ -99,7 +101,7 @@
         # step 2: create the entry
         items = self.serversCertificatesTree.findItems(
             organisation,
-            Qt.MatchFixedString | Qt.MatchCaseSensitive)
+            Qt.MatchFlag.MatchFixedString | Qt.MatchFlag.MatchCaseSensitive)
         if len(items) == 0:
             parent = QTreeWidgetItem(
                 self.serversCertificatesTree, [organisation])
@@ -211,7 +213,8 @@
             for cert in certs:
                 if cert in sCerts:
                     commonStr = ", ".join(
-                        cert.subjectInfo(QSslCertificate.CommonName))
+                        cert.subjectInfo(
+                            QSslCertificate.SubjectInfo.CommonName))
                     E5MessageBox.warning(
                         self,
                         self.tr("Import Certificate"),
@@ -283,7 +286,7 @@
         self.caCertificatesTree.expandAll()
         for i in range(self.caCertificatesTree.columnCount()):
             self.caCertificatesTree.resizeColumnToContents(i)
-        self.caCertificatesTree.sortItems(0, Qt.AscendingOrder)
+        self.caCertificatesTree.sortItems(0, Qt.SortOrder.AscendingOrder)
     
     def __createCaCertificateEntry(self, cert):
         """
@@ -293,9 +296,11 @@
         """
         # step 1: extract the info to be shown
         organisation = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.Organization)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.Organization)))
         commonName = Utilities.decodeString(
-            ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))
+            ", ".join(cert.subjectInfo(
+                QSslCertificate.SubjectInfo.CommonName)))
         if organisation is None or organisation == "":
             organisation = self.tr("(Unknown)")
         if commonName is None or commonName == "":
@@ -305,7 +310,7 @@
         # step 2: create the entry
         items = self.caCertificatesTree.findItems(
             organisation,
-            Qt.MatchFixedString | Qt.MatchCaseSensitive)
+            Qt.MatchFlag.MatchFixedString | Qt.MatchFlag.MatchCaseSensitive)
         if len(items) == 0:
             parent = QTreeWidgetItem(self.caCertificatesTree, [organisation])
             parent.setFirstColumnSpanned(True)
@@ -395,7 +400,8 @@
             for cert in certs:
                 if cert in caCerts:
                     commonStr = ", ".join(
-                        cert.subjectInfo(QSslCertificate.CommonName))
+                        cert.subjectInfo(
+                            QSslCertificate.SubjectInfo.CommonName))
                     E5MessageBox.warning(
                         self,
                         self.tr("Import Certificate"),
@@ -463,7 +469,7 @@
                         return
                 
                 f = QFile(fname)
-                if not f.open(QIODevice.WriteOnly):
+                if not f.open(QIODevice.OpenModeFlag.WriteOnly):
                     E5MessageBox.critical(
                         self,
                         self.tr("Export Certificate"),
@@ -495,7 +501,7 @@
         
         if fname:
             f = QFile(fname)
-            if not f.open(QIODevice.ReadOnly):
+            if not f.open(QIODevice.OpenModeFlag.ReadOnly):
                 E5MessageBox.critical(
                     self,
                     self.tr("Export Certificate"),
@@ -507,9 +513,9 @@
             
             crt = f.readAll()
             f.close()
-            cert = QSslCertificate.fromData(crt, QSsl.Pem)
+            cert = QSslCertificate.fromData(crt, QSsl.EncodingFormat.Pem)
             if not cert:
-                cert = QSslCertificate.fromData(crt, QSsl.Der)
+                cert = QSslCertificate.fromData(crt, QSsl.EncodingFormat.Der)
             
             return cert
         
--- a/eric6/E5Network/E5SslCertificatesInfoWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5SslCertificatesInfoWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -49,10 +49,12 @@
             self.__chain = certificateChain[:]
             
             for cert in self.__chain:
-                name = ", ".join(cert.subjectInfo(QSslCertificate.CommonName))
+                name = ", ".join(cert.subjectInfo(
+                    QSslCertificate.SubjectInfo.CommonName))
                 if not name:
                     name = ", ".join(
-                        cert.subjectInfo(QSslCertificate.Organization))
+                        cert.subjectInfo(
+                            QSslCertificate.SubjectInfo.Organization))
                 if not name:
                     name = cert.serialNumber()
                 self.chainComboBox.addItem(name)
@@ -90,33 +92,36 @@
             
             self.subjectCommonNameLabel.setText(self.__certificateString(
                 ", ".join(certificate.subjectInfo(
-                    QSslCertificate.CommonName))))
+                    QSslCertificate.SubjectInfo.CommonName))))
             self.subjectOrganizationLabel.setText(self.__certificateString(
                 ", ".join(certificate.subjectInfo(
-                    QSslCertificate.Organization))))
+                    QSslCertificate.SubjectInfo.Organization))))
             self.subjectOrganizationalUnitLabel.setText(
                 self.__certificateString(", ".join(
                     certificate.subjectInfo(
-                        QSslCertificate.OrganizationalUnitName))))
+                        QSslCertificate.SubjectInfo.OrganizationalUnitName))))
             self.issuerCommonNameLabel.setText(self.__certificateString(
-                ", ".join(certificate.issuerInfo(QSslCertificate.CommonName))))
+                ", ".join(certificate.issuerInfo(
+                    QSslCertificate.SubjectInfo.CommonName))))
             self.issuerOrganizationLabel.setText(self.__certificateString(
                 ", ".join(certificate.issuerInfo(
-                    QSslCertificate.Organization))))
+                    QSslCertificate.SubjectInfo.Organization))))
             self.issuerOrganizationalUnitLabel.setText(
                 self.__certificateString(", ".join(
                     certificate.issuerInfo(
-                        QSslCertificate.OrganizationalUnitName))))
+                        QSslCertificate.SubjectInfo.OrganizationalUnitName))))
             self.serialNumberLabel.setText(self.__serialNumber(certificate))
             self.effectiveLabel.setText(
                 certificate.effectiveDate().toString("yyyy-MM-dd"))
             self.expiresLabel.setText(
                 certificate.expiryDate().toString("yyyy-MM-dd"))
             self.sha1Label.setText(self.__formatHexString(
-                str(certificate.digest(QCryptographicHash.Sha1).toHex(),
+                str(certificate.digest(
+                    QCryptographicHash.Algorithm.Sha1).toHex(),
                     encoding="ascii")))
             self.md5Label.setText(self.__formatHexString(
-                str(certificate.digest(QCryptographicHash.Md5).toHex(),
+                str(certificate.digest(
+                    QCryptographicHash.Algorithm.Md5).toHex(),
                     encoding="ascii")))
             
             if certificate.isBlacklisted():
--- a/eric6/E5Network/E5SslErrorHandler.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5SslErrorHandler.py	Tue Mar 02 17:17:09 2021 +0100
@@ -58,14 +58,15 @@
         sslCfg = QSslConfiguration.defaultConfiguration()
         sslCfg.setCaCertificates(caList)
         try:
-            sslProtocol = QSsl.TlsV1_1OrLater
+            sslProtocol = QSsl.SslProtocol.TlsV1_1OrLater
             if Globals.isWindowsPlatform() and platform.win32_ver()[0] == '7':
-                sslProtocol = QSsl.SecureProtocols
+                sslProtocol = QSsl.SslProtocol.SecureProtocols
         except AttributeError:
-            sslProtocol = QSsl.SecureProtocols
+            sslProtocol = QSsl.SslProtocol.SecureProtocols
         sslCfg.setProtocol(sslProtocol)
         try:
-            sslCfg.setSslOption(QSsl.SslOptionDisableCompression, True)
+            sslCfg.setSslOption(QSsl.SslOption.SslOptionDisableCompression,
+                                True)
         except AttributeError:
             pass
         QSslConfiguration.setDefaultConfiguration(sslCfg)
@@ -125,7 +126,7 @@
             server += ":{0:d}".format(port)
         if errors:
             for err in errors:
-                if err.error() == QSslError.NoError:
+                if err.error() == QSslError.SslError.NoError:
                     continue
                 if server in caMerge and err.certificate() in caMerge[server]:
                     continue
@@ -173,12 +174,13 @@
                         caList.append(cert)
                     sslCfg.setCaCertificates(caList)
                     try:
-                        sslCfg.setProtocol(QSsl.TlsV1_1OrLater)
+                        sslCfg.setProtocol(QSsl.SslProtocol.TlsV1_1OrLater)
                     except AttributeError:
-                        sslCfg.setProtocol(QSsl.SecureProtocols)
+                        sslCfg.setProtocol(QSsl.SslProtocol.SecureProtocols)
                     try:
-                        sslCfg.setSslOption(QSsl.SslOptionDisableCompression,
-                                            True)
+                        sslCfg.setSslOption(
+                            QSsl.SslOption.SslOptionDisableCompression,
+                            True)
                     except AttributeError:
                         pass
                     QSslConfiguration.setDefaultConfiguration(sslCfg)
@@ -212,7 +214,8 @@
         ).format(
             Utilities.html_encode(
                 Utilities.decodeString(
-                    ", ".join(cert.subjectInfo(QSslCertificate.CommonName))
+                    ", ".join(cert.subjectInfo(
+                        QSslCertificate.SubjectInfo.CommonName))
                 )
             )
         )
@@ -222,7 +225,8 @@
         ).format(
             Utilities.html_encode(
                 Utilities.decodeString(
-                    ", ".join(cert.subjectInfo(QSslCertificate.Organization))
+                    ", ".join(cert.subjectInfo(
+                        QSslCertificate.SubjectInfo.Organization))
                 )
             )
         )
@@ -232,7 +236,8 @@
         ).format(
             Utilities.html_encode(
                 Utilities.decodeString(
-                    ", ".join(cert.issuerInfo(QSslCertificate.CommonName))
+                    ", ".join(cert.issuerInfo(
+                        QSslCertificate.SubjectInfo.CommonName))
                 )
             )
         )
--- a/eric6/E5Network/E5SslInfoWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5SslInfoWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -47,11 +47,12 @@
         ## Identity Information
         ##########################################
         imageLabel = QLabel(self)
-        layout.addWidget(imageLabel, rows, 0, Qt.AlignCenter)
+        layout.addWidget(imageLabel, rows, 0, Qt.AlignmentFlag.AlignCenter)
         
         label = QLabel(self)
         label.setWordWrap(True)
-        label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        label.setSizePolicy(QSizePolicy.Policy.Expanding,
+                            QSizePolicy.Policy.Preferred)
         label.setText(self.tr("Identity"))
         font = label.font()
         font.setBold(True)
@@ -69,7 +70,7 @@
             valid = not cert.isBlacklisted()
             if valid:
                 txt = ", ".join(
-                    cert.issuerInfo(QSslCertificate.CommonName))
+                    cert.issuerInfo(QSslCertificate.SubjectInfo.CommonName))
                 label.setText(self.tr(
                     "The certificate for this site is valid"
                     " and has been verified by:\n{0}").format(
@@ -97,7 +98,7 @@
         ## Identity Information
         ##########################################
         imageLabel = QLabel(self)
-        layout.addWidget(imageLabel, rows, 0, Qt.AlignCenter)
+        layout.addWidget(imageLabel, rows, 0, Qt.AlignmentFlag.AlignCenter)
         
         label = QLabel(self)
         label.setWordWrap(True)
@@ -127,15 +128,15 @@
             layout.addWidget(label, rows, 1)
             
             proto = cipher.protocol()
-            if proto == QSsl.SslV3:
+            if proto == QSsl.SslProtocol.SslV3:
                 sslVersion = "SSL 3.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityLow32"))
-            elif proto == QSsl.TlsV1SslV3:
+            elif proto == QSsl.SslProtocol.TlsV1SslV3:
                 sslVersion = "TLS 1.0/SSL 3.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityLow32"))
-            elif proto == QSsl.SslV2:
+            elif proto == QSsl.SslProtocol.SslV2:
                 sslVersion = "SSL 2.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityLow32"))
@@ -143,19 +144,19 @@
                 sslVersion = self.tr("unknown")
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityLow32"))
-            if proto == QSsl.TlsV1_0:
+            if proto == QSsl.SslProtocol.TlsV1_0:
                 sslVersion = "TLS 1.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32"))
-            elif proto == QSsl.TlsV1_1:
+            elif proto == QSsl.SslProtocol.TlsV1_1:
                 sslVersion = "TLS 1.1"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32"))
-            elif proto == QSsl.TlsV1_2:
+            elif proto == QSsl.SslProtocol.TlsV1_2:
                 sslVersion = "TLS 1.2"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32"))
-            elif proto == QSsl.TlsV1_3:
+            elif proto == QSsl.SslProtocol.TlsV1_3:
                 sslVersion = "TLS 1.3"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32"))
--- a/eric6/E5Network/E5XmlRpcClient.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/E5XmlRpcClient.py	Tue Mar 02 17:17:09 2021 +0100
@@ -49,7 +49,8 @@
         
         self.__request = QNetworkRequest(QUrl(url))
         self.__request.setRawHeader(b"User-Agent", b"E5XmlRpcClient/1.0")
-        self.__request.setHeader(QNetworkRequest.ContentTypeHeader, "text/xml")
+        self.__request.setHeader(
+            QNetworkRequest.KnownHeaders.ContentTypeHeader, "text/xml")
     
     def setUrl(self, url):
         """
@@ -77,8 +78,9 @@
         if not isinstance(args, tuple):
             raise TypeError("argument 'args' must be tuple")
         
-        QGuiApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         data = xmlrpc.dumps(args, method).encode("utf-8")
         reply = self.__networkManager.post(
@@ -101,7 +103,8 @@
         @param errors list of SSL errors (list of QSslError)
         """
         QGuiApplication.restoreOverrideCursor()
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
         ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
         if ignored == E5SslErrorHandler.NotIgnored and reply in self.__callmap:
@@ -118,9 +121,10 @@
             return
         
         QGuiApplication.restoreOverrideCursor()
-        QGuiApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QGuiApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             self.__callmap[reply][1](xmlrpc.TRANSPORT_ERROR,
                                      reply.errorString())
         else:
--- a/eric6/E5Network/__init__.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Network/__init__.py	Tue Mar 02 17:17:09 2021 +0100
@@ -33,7 +33,10 @@
     @rtype bool
     """
     h = QHostAddress(address)
-    return not h.isNull() and h.protocol() == QAbstractSocket.IPv4Protocol
+    return (
+        not h.isNull() and
+        h.protocol() == QAbstractSocket.NetworkLayerProtocol.IPv4Protocol
+    )
 
 
 def isValidIPv6Address(address):
@@ -46,4 +49,7 @@
     @rtype bool
     """
     h = QHostAddress(address)
-    return not h.isNull() and h.protocol() == QAbstractSocket.IPv6Protocol
+    return (
+        not h.isNull() and
+        h.protocol() == QAbstractSocket.NetworkLayerProtocol.IPv6Protocol
+    )
--- a/eric6/Graphics/AssociationItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/AssociationItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -73,8 +73,8 @@
         E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100),
                              arrowFilled, arrowType, colors, parent)
         
-        self.setFlag(QGraphicsItem.ItemIsMovable, False)
-        self.setFlag(QGraphicsItem.ItemIsSelectable, False)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, False)
         
         if topToBottom:
             self.calculateEndingPoints = (
@@ -383,7 +383,7 @@
         for line in lines:
             if (
                 intersectLine.intersect(line, intersectPoint) ==
-                QLineF.BoundedIntersection
+                QLineF.IntersectType.BoundedIntersection
             ):
                 return intersectPoint
         return QPointF(-1.0, -1.0)
--- a/eric6/Graphics/ClassItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/ClassItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -198,8 +198,8 @@
         """
         pen = self.pen()
         if (
-            (option.state & QStyle.State_Selected) ==
-            QStyle.State(QStyle.State_Selected)
+            (option.state & QStyle.StateFlag.State_Selected) ==
+            QStyle.State(QStyle.StateFlag.State_Selected)
         ):
             pen.setWidth(2)
         else:
--- a/eric6/Graphics/ModuleItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/ModuleItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -148,8 +148,8 @@
         """
         pen = self.pen()
         if (
-            (option.state & QStyle.State_Selected) ==
-            QStyle.State(QStyle.State_Selected)
+            (option.state & QStyle.StateFlag.State_Selected) ==
+            QStyle.State(QStyle.StateFlag.State_Selected)
         ):
             pen.setWidth(2)
         else:
--- a/eric6/Graphics/PackageItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/PackageItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -168,8 +168,8 @@
         """
         pen = self.pen()
         if (
-            (option.state & QStyle.State_Selected) ==
-            QStyle.State(QStyle.State_Selected)
+            (option.state & QStyle.StateFlag.State_Selected) ==
+            QStyle.State(QStyle.StateFlag.State_Selected)
         ):
             pen.setWidth(2)
         else:
--- a/eric6/Graphics/PixmapDiagram.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/PixmapDiagram.py	Tue Mar 02 17:17:09 2021 +0100
@@ -53,14 +53,14 @@
         
         self.pixmapLabel = QLabel()
         self.pixmapLabel.setObjectName("pixmapLabel")
-        self.pixmapLabel.setBackgroundRole(QPalette.Base)
+        self.pixmapLabel.setBackgroundRole(QPalette.ColorRole.Base)
         self.pixmapLabel.setSizePolicy(
-            QSizePolicy.Ignored, QSizePolicy.Ignored)
+            QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
         self.pixmapLabel.setScaledContents(True)
         
         self.pixmapView = QScrollArea()
         self.pixmapView.setObjectName("pixmapView")
-        self.pixmapView.setBackgroundRole(QPalette.Dark)
+        self.pixmapView.setBackgroundRole(QPalette.ColorRole.Dark)
         self.pixmapView.setWidget(self.pixmapLabel)
         
         self.setCentralWidget(self.pixmapView)
@@ -84,7 +84,7 @@
         self.__initContextMenu()
         self.__initToolBars()
         
-        self.grabGesture(Qt.PinchGesture)
+        self.grabGesture(Qt.GestureType.PinchGesture)
     
     def __initActions(self):
         """
@@ -115,7 +115,7 @@
         self.__menu.addAction(self.printPreviewAct)
         self.__menu.addAction(self.printAct)
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         
     def __showContextMenu(self, coord):
@@ -139,8 +139,8 @@
         self.graphicsToolBar.addAction(self.printPreviewAct)
         self.graphicsToolBar.addAction(self.printAct)
         
-        self.addToolBar(Qt.TopToolBarArea, self.windowToolBar)
-        self.addToolBar(Qt.TopToolBarArea, self.graphicsToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.windowToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.graphicsToolBar)
         
     def __showPixmap(self, filename):
         """
@@ -185,7 +185,7 @@
         
         @param evt reference to the wheel event (QWheelEvent)
         """
-        if evt.modifiers() & Qt.ControlModifier:
+        if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
             delta = evt.angleDelta().y()
             if delta < 0:
                 self.__zoomOut()
@@ -203,7 +203,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, if the event was handled (boolean)
         """
-        if evt.type() == QEvent.Gesture:
+        if evt.type() == QEvent.Type.Gesture:
             self.gestureEvent(evt)
             return True
         
@@ -215,11 +215,11 @@
         
         @param evt reference to the gesture event (QGestureEvent
         """
-        pinch = evt.gesture(Qt.PinchGesture)
+        pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:
-            if pinch.state() == Qt.GestureStarted:
+            if pinch.state() == Qt.GestureState.GestureStarted:
                 pinch.setTotalScaleFactor(self.__zoom() / 100)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.__doZoom(int(pinch.totalScaleFactor() * 100))
             evt.accept()
     
@@ -306,16 +306,16 @@
         """
         Private slot called to print the diagram.
         """
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
         printDialog = QPrintDialog(printer, self)
@@ -328,22 +328,22 @@
         """
         from PyQt5.QtPrintSupport import QPrintPreviewDialog
         
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPageMargins(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
             Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Millimeter
+            QPrinter.Unit.Millimeter
         )
         printer.setPrinterName(Preferences.getPrinter("PrinterName"))
         
@@ -396,12 +396,12 @@
                          marginX + width, marginY + height + 2)
         painter.setFont(font)
         painter.drawText(marginX, marginY + height + 4, width,
-                         fontHeight, Qt.AlignRight, s)
+                         fontHeight, Qt.AlignmentFlag.AlignRight, s)
 
         # render the diagram
         size = self.pixmapLabel.pixmap().size()
         size.scale(QSize(width - 10, height - 10),  # 5 px inner margin
-                   Qt.KeepAspectRatio)
+                   Qt.AspectRatioMode.KeepAspectRatio)
         painter.setViewport(marginX + 5, marginY + 5,
                             size.width(), size.height())
         painter.setWindow(self.pixmapLabel.pixmap().rect())
--- a/eric6/Graphics/SvgDiagram.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/SvgDiagram.py	Tue Mar 02 17:17:09 2021 +0100
@@ -51,12 +51,13 @@
         
         self.svgWidget = QSvgWidget()
         self.svgWidget.setObjectName("svgWidget")
-        self.svgWidget.setBackgroundRole(QPalette.Base)
-        self.svgWidget.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored)
+        self.svgWidget.setBackgroundRole(QPalette.ColorRole.Base)
+        self.svgWidget.setSizePolicy(
+            QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
         
         self.svgView = QScrollArea()
         self.svgView.setObjectName("svgView")
-        self.svgView.setBackgroundRole(QPalette.Dark)
+        self.svgView.setBackgroundRole(QPalette.ColorRole.Dark)
         self.svgView.setWidget(self.svgWidget)
         
         self.setCentralWidget(self.svgView)
@@ -82,7 +83,7 @@
         self.__initContextMenu()
         self.__initToolBars()
         
-        self.grabGesture(Qt.PinchGesture)
+        self.grabGesture(Qt.GestureType.PinchGesture)
         
     def __initActions(self):
         """
@@ -113,7 +114,7 @@
         self.__menu.addAction(self.printPreviewAct)
         self.__menu.addAction(self.printAct)
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__showContextMenu)
         
     def __showContextMenu(self, coord):
@@ -137,8 +138,8 @@
         self.graphicsToolBar.addAction(self.printPreviewAct)
         self.graphicsToolBar.addAction(self.printAct)
         
-        self.addToolBar(Qt.TopToolBarArea, self.windowToolBar)
-        self.addToolBar(Qt.TopToolBarArea, self.graphicsToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.windowToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.graphicsToolBar)
         
     def getDiagramName(self):
         """
@@ -154,7 +155,7 @@
         
         @param evt reference to the wheel event (QWheelEvent)
         """
-        if evt.modifiers() & Qt.ControlModifier:
+        if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
             delta = evt.angleDelta().y()
             if delta < 0:
                 self.__zoomOut()
@@ -172,7 +173,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, if the event was handled (boolean)
         """
-        if evt.type() == QEvent.Gesture:
+        if evt.type() == QEvent.Type.Gesture:
             self.gestureEvent(evt)
             return True
         
@@ -184,11 +185,11 @@
         
         @param evt reference to the gesture event (QGestureEvent
         """
-        pinch = evt.gesture(Qt.PinchGesture)
+        pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:
-            if pinch.state() == Qt.GestureStarted:
+            if pinch.state() == Qt.GestureState.GestureStarted:
                 pinch.setTotalScaleFactor(self.__zoom() / 100)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.__doZoom(int(pinch.totalScaleFactor() * 100))
             evt.accept()
     
@@ -273,16 +274,16 @@
         """
         Private slot called to print the diagram.
         """
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
             printer.setPrinterName(printerName)
@@ -297,22 +298,22 @@
         """
         from PyQt5.QtPrintSupport import QPrintPreviewDialog
         
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPageMargins(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
             Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Millimeter
+            QPrinter.Unit.Millimeter
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
@@ -367,7 +368,7 @@
                          marginX + width, marginY + height + 2)
         painter.setFont(font)
         painter.drawText(marginX, marginY + height + 4, width,
-                         fontHeight, Qt.AlignRight, s)
+                         fontHeight, Qt.AlignmentFlag.AlignRight, s)
 
         # render the diagram
         painter.setViewport(marginX, marginY, width, height)
--- a/eric6/Graphics/UMLDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/UMLDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -129,9 +129,9 @@
         
         self.umlToolBar = self.umlView.initToolBar()
         
-        self.addToolBar(Qt.TopToolBarArea, self.fileToolBar)
-        self.addToolBar(Qt.TopToolBarArea, self.windowToolBar)
-        self.addToolBar(Qt.TopToolBarArea, self.umlToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.fileToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.windowToolBar)
+        self.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.umlToolBar)
     
     def show(self, fromFile=False):
         """
--- a/eric6/Graphics/UMLGraphicsView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/UMLGraphicsView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -44,7 +44,8 @@
         """
         E5GraphicsView.__init__(self, scene, parent)
         self.setObjectName("UMLGraphicsView")
-        self.setViewportUpdateMode(QGraphicsView.FullViewportUpdate)
+        self.setViewportUpdateMode(
+            QGraphicsView.ViewportUpdateMode.FullViewportUpdate)
         
         self.diagramName = "Unnamed"
         self.__itemId = -1
@@ -66,7 +67,7 @@
         
         scene.changed.connect(self.__sceneChanged)
         
-        self.grabGesture(Qt.PinchGesture)
+        self.grabGesture(Qt.GestureType.PinchGesture)
         
     def __initActions(self):
         """
@@ -126,37 +127,43 @@
         self.alignLeftAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignLeft"),
             self.tr("Align Left"), self)
-        self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft)
+        self.alignMapper.setMapping(
+            self.alignLeftAct, Qt.AlignmentFlag.AlignLeft)
         self.alignLeftAct.triggered.connect(self.alignMapper.map)
         
         self.alignHCenterAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignHCenter"),
             self.tr("Align Center Horizontal"), self)
-        self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter)
+        self.alignMapper.setMapping(
+            self.alignHCenterAct, Qt.AlignmentFlag.AlignHCenter)
         self.alignHCenterAct.triggered.connect(self.alignMapper.map)
         
         self.alignRightAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignRight"),
             self.tr("Align Right"), self)
-        self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight)
+        self.alignMapper.setMapping(
+            self.alignRightAct, Qt.AlignmentFlag.AlignRight)
         self.alignRightAct.triggered.connect(self.alignMapper.map)
         
         self.alignTopAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignTop"),
             self.tr("Align Top"), self)
-        self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop)
+        self.alignMapper.setMapping(
+            self.alignTopAct, Qt.AlignmentFlag.AlignTop)
         self.alignTopAct.triggered.connect(self.alignMapper.map)
         
         self.alignVCenterAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignVCenter"),
             self.tr("Align Center Vertical"), self)
-        self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter)
+        self.alignMapper.setMapping(
+            self.alignVCenterAct, Qt.AlignmentFlag.AlignVCenter)
         self.alignVCenterAct.triggered.connect(self.alignMapper.map)
         
         self.alignBottomAct = QAction(
             UI.PixmapCache.getIcon("shapesAlignBottom"),
             self.tr("Align Bottom"), self)
-        self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom)
+        self.alignMapper.setMapping(
+            self.alignBottomAct, Qt.AlignmentFlag.AlignBottom)
         self.alignBottomAct.triggered.connect(self.alignMapper.map)
         
     def __checkSizeActions(self):
@@ -308,7 +315,7 @@
         sceneRect = self.scene().sceneRect()
         dlg = UMLSceneSizeDialog(sceneRect.width(), sceneRect.height(),
                                  rect.width(), rect.height(), self)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             width, height = dlg.getData()
             self.setSceneSize(width, height)
         self.__checkSizeActions()
@@ -400,22 +407,22 @@
         """
         Public slot called to print the diagram.
         """
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPageMargins(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
             Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Millimeter
+            QPrinter.Unit.Millimeter
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
@@ -432,22 +439,22 @@
         """
         from PyQt5.QtPrintSupport import QPrintPreviewDialog
         
-        printer = QPrinter(mode=QPrinter.ScreenResolution)
+        printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
         if Preferences.getPrinter("ColorMode"):
-            printer.setColorMode(QPrinter.Color)
+            printer.setColorMode(QPrinter.ColorMode.Color)
         else:
-            printer.setColorMode(QPrinter.GrayScale)
+            printer.setColorMode(QPrinter.ColorMode.GrayScale)
         if Preferences.getPrinter("FirstPageFirst"):
-            printer.setPageOrder(QPrinter.FirstPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
-            printer.setPageOrder(QPrinter.LastPageFirst)
+            printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
         printer.setPageMargins(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
             Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Millimeter
+            QPrinter.Unit.Millimeter
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
@@ -488,27 +495,27 @@
         amount = None
         for i, item in enumerate(items):
             rect = item.sceneBoundingRect()
-            if alignment == Qt.AlignLeft:
+            if alignment == Qt.AlignmentFlag.AlignLeft:
                 if amount is None or rect.x() < amount:
                     amount = rect.x()
                     index = i
-            elif alignment == Qt.AlignRight:
+            elif alignment == Qt.AlignmentFlag.AlignRight:
                 if amount is None or rect.x() + rect.width() > amount:
                     amount = rect.x() + rect.width()
                     index = i
-            elif alignment == Qt.AlignHCenter:
+            elif alignment == Qt.AlignmentFlag.AlignHCenter:
                 if amount is None or rect.width() > amount:
                     amount = rect.width()
                     index = i
-            elif alignment == Qt.AlignTop:
+            elif alignment == Qt.AlignmentFlag.AlignTop:
                 if amount is None or rect.y() < amount:
                     amount = rect.y()
                     index = i
-            elif alignment == Qt.AlignBottom:
+            elif alignment == Qt.AlignmentFlag.AlignBottom:
                 if amount is None or rect.y() + rect.height() > amount:
                     amount = rect.y() + rect.height()
                     index = i
-            elif alignment == Qt.AlignVCenter:
+            elif alignment == Qt.AlignmentFlag.AlignVCenter:
                 if amount is None or rect.height() > amount:
                     amount = rect.height()
                     index = i
@@ -520,26 +527,26 @@
                 continue
             itemrect = item.sceneBoundingRect()
             xOffset = yOffset = 0
-            if alignment == Qt.AlignLeft:
+            if alignment == Qt.AlignmentFlag.AlignLeft:
                 xOffset = rect.x() - itemrect.x()
-            elif alignment == Qt.AlignRight:
+            elif alignment == Qt.AlignmentFlag.AlignRight:
                 xOffset = (
                     (rect.x() + rect.width()) -
                     (itemrect.x() + itemrect.width())
                 )
-            elif alignment == Qt.AlignHCenter:
+            elif alignment == Qt.AlignmentFlag.AlignHCenter:
                 xOffset = (
                     (rect.x() + rect.width() // 2) -
                     (itemrect.x() + itemrect.width() // 2)
                 )
-            elif alignment == Qt.AlignTop:
+            elif alignment == Qt.AlignmentFlag.AlignTop:
                 yOffset = rect.y() - itemrect.y()
-            elif alignment == Qt.AlignBottom:
+            elif alignment == Qt.AlignmentFlag.AlignBottom:
                 yOffset = (
                     (rect.y() + rect.height()) -
                     (itemrect.y() + itemrect.height())
                 )
-            elif alignment == Qt.AlignVCenter:
+            elif alignment == Qt.AlignmentFlag.AlignVCenter:
                 yOffset = (
                     (rect.y() + rect.height() // 2) -
                     (itemrect.y() + itemrect.height() // 2)
@@ -575,20 +582,21 @@
         @param evt reference to the key event (QKeyEvent)
         """
         key = evt.key()
-        if key in [Qt.Key_Up, Qt.Key_Down, Qt.Key_Left, Qt.Key_Right]:
+        if key in [Qt.Key.Key_Up, Qt.Key.Key_Down, Qt.Key.Key_Left,
+                   Qt.Key.Key_Right]:
             items = self.filteredItems(self.scene().selectedItems())
             if items:
-                if evt.modifiers() & Qt.ControlModifier:
+                if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
                     stepSize = 50
                 else:
                     stepSize = 5
-                if key == Qt.Key_Up:
+                if key == Qt.Key.Key_Up:
                     dx = 0
                     dy = -stepSize
-                elif key == Qt.Key_Down:
+                elif key == Qt.Key.Key_Down:
                     dx = 0
                     dy = stepSize
-                elif key == Qt.Key_Left:
+                elif key == Qt.Key.Key_Left:
                     dx = -stepSize
                     dy = 0
                 else:
@@ -607,7 +615,7 @@
         
         @param evt reference to the wheel event (QWheelEvent)
         """
-        if evt.modifiers() & Qt.ControlModifier:
+        if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
             delta = evt.angleDelta().y()
             if delta < 0:
                 self.zoomOut()
@@ -625,7 +633,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, if the event was handled (boolean)
         """
-        if evt.type() == QEvent.Gesture:
+        if evt.type() == QEvent.Type.Gesture:
             self.gestureEvent(evt)
             return True
         
@@ -637,11 +645,11 @@
         
         @param evt reference to the gesture event (QGestureEvent
         """
-        pinch = evt.gesture(Qt.PinchGesture)
+        pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:
-            if pinch.state() == Qt.GestureStarted:
+            if pinch.state() == Qt.GestureState.GestureStarted:
                 pinch.setTotalScaleFactor(self.zoom() / 100.0)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.setZoom(int(pinch.totalScaleFactor() * 100))
             evt.accept()
     
--- a/eric6/Graphics/UMLItem.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/UMLItem.py	Tue Mar 02 17:17:09 2021 +0100
@@ -63,7 +63,8 @@
         self.model = model
         
         if colors is None:
-            self._colors = (QColor(Qt.black), QColor(Qt.white))
+            self._colors = (QColor(Qt.GlobalColor.black),
+                            QColor(Qt.GlobalColor.white))
         else:
             self._colors = colors
         self.setPen(QPen(self._colors[0]))
@@ -78,13 +79,14 @@
         
         if rounded:
             p = self.pen()
-            p.setCapStyle(Qt.RoundCap)
-            p.setJoinStyle(Qt.RoundJoin)
+            p.setCapStyle(Qt.PenCapStyle.RoundCap)
+            p.setJoinStyle(Qt.PenJoinStyle.RoundJoin)
         
-        self.setFlag(QGraphicsItem.ItemIsMovable, True)
-        self.setFlag(QGraphicsItem.ItemIsSelectable, True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, True)
         try:
-            self.setFlag(QGraphicsItem.ItemSendsGeometryChanges, True)
+            self.setFlag(
+                QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges, True)
         except AttributeError:
             # only available for Qt 4.6.0 and newer
             pass
@@ -175,7 +177,7 @@
         @param value the value of the change
         @return adjusted values
         """
-        if change == QGraphicsItem.ItemPositionChange:
+        if change == QGraphicsItem.GraphicsItemChange.ItemPositionChange:
             # 1. remember to adjust associations
             self.shouldAdjustAssociations = True
             
@@ -199,8 +201,8 @@
         """
         pen = self.pen()
         if (
-            (option.state & QStyle.State_Selected) ==
-            QStyle.State(QStyle.State_Selected)
+            (option.state & QStyle.StateFlag.State_Selected) ==
+            QStyle.State(QStyle.StateFlag.State_Selected)
         ):
             pen.setWidth(2)
         else:
--- a/eric6/HexEdit/HexEditChunks.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/HexEdit/HexEditChunks.py	Tue Mar 02 17:17:09 2021 +0100
@@ -33,9 +33,9 @@
     interface. When the app uses a QByteArray or Python bytearray interface,
     QBuffer is used to provide again a QIODevice like interface. No data will
     be changed, therefore HexEditChunks opens the QIODevice in
-    QIODevice.ReadOnly mode. After every access HexEditChunks closes the
-    QIODevice. That's why external applications can overwrite files while
-    HexEditWidget shows them.
+    QIODevice.OpenModeFlag.ReadOnly mode. After every access HexEditChunks
+    closes the QIODevice. That's why external applications can overwrite
+    files while HexEditWidget shows them.
 
     When the the user starts to edit the data, HexEditChunks creates a local
     copy of a chunk of data (4 kilobytes) and notes all changes there. Parallel
@@ -74,7 +74,7 @@
         @rtype bool
         """
         self.__ioDevice = ioDevice
-        ok = self.__ioDevice.open(QIODevice.ReadOnly)
+        ok = self.__ioDevice.open(QIODevice.OpenModeFlag.ReadOnly)
         if ok:
             # open successfully
             self.__size = self.__ioDevice.size()
@@ -119,7 +119,7 @@
         elif (pos + maxSize) > self.__size:
             maxSize = self.__size - pos
         
-        self.__ioDevice.open(QIODevice.ReadOnly)
+        self.__ioDevice.open(QIODevice.OpenModeFlag.ReadOnly)
         
         while maxSize > 0:
             chunk.absPos = sys.maxsize
@@ -185,7 +185,7 @@
             # write all data
             count = self.__size
         
-        ok = ioDevice.open(QIODevice.WriteOnly)
+        ok = ioDevice.open(QIODevice.OpenModeFlag.WriteOnly)
         if ok:
             idx = pos
             while idx < count:
@@ -434,7 +434,7 @@
             newChunk = HexEditChunk()
             readAbsPos = absPos - ioDelta
             readPos = readAbsPos & self.READ_CHUNK_MASK
-            self.__ioDevice.open(QIODevice.ReadOnly)
+            self.__ioDevice.open(QIODevice.OpenModeFlag.ReadOnly)
             self.__ioDevice.seek(readPos)
             newChunk.data = bytearray(self.__ioDevice.read(self.CHUNK_SIZE))
             self.__ioDevice.close()
--- a/eric6/HexEdit/HexEditGotoWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/HexEdit/HexEditGotoWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -59,7 +59,7 @@
         """
         Private slot to close the widget.
         """
-        self.__editor.setFocus(Qt.OtherFocusReason)
+        self.__editor.setFocus(Qt.FocusReason.OtherFocusReason)
         self.close()
     
     @pyqtSlot(int)
@@ -139,7 +139,7 @@
         @param event reference to the key press event
         @type QKeyEvent
         """
-        if event.key() == Qt.Key_Escape:
+        if event.key() == Qt.Key.Key_Escape:
             self.close()
     
     def __convertText(self, txt, oldFormat, newFormat):
--- a/eric6/HexEdit/HexEditMainWindow.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/HexEdit/HexEditMainWindow.py	Tue Mar 02 17:17:09 2021 +0100
@@ -607,7 +607,7 @@
             """ with your prefered values.</p>"""
         ))
         self.prefAct.triggered.connect(self.__showPreferences)
-        self.prefAct.setMenuRole(QAction.PreferencesRole)
+        self.prefAct.setMenuRole(QAction.MenuRole.PreferencesRole)
         self.__actions.append(self.prefAct)
     
     def __setReadOnlyActionTexts(self):
@@ -775,7 +775,8 @@
             """<p>This part of the status bar displays the cursor"""
             """ address.</p>"""
         ))
-        self.__sbAddress.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbAddress.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbSelection = QLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbSelection)
@@ -783,7 +784,8 @@
             """<p>This part of the status bar displays some selection"""
             """ information.</p>"""
         ))
-        self.__sbSelection.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbSelection.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbSize = QLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbSize)
@@ -791,14 +793,16 @@
             """<p>This part of the status bar displays the size of the"""
             """ binary data.</p>"""
         ))
-        self.__sbSize.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbSize.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         
         self.__sbEditMode = E5ClickableLabel(self.__statusBar)
         self.__statusBar.addPermanentWidget(self.__sbEditMode)
         self.__sbEditMode.setWhatsThis(self.tr(
             """<p>This part of the status bar displays the edit mode.</p>"""
         ))
-        self.__sbEditMode.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbEditMode.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         self.__sbEditMode.clicked.connect(self.__toggleEditMode)
         
         self.__sbReadOnly = E5ClickableLabel(self.__statusBar)
@@ -807,7 +811,8 @@
             """<p>This part of the status bar displays the read"""
             """ only mode.</p>"""
         ))
-        self.__sbReadOnly.setFrameStyle(QFrame.StyledPanel | QFrame.Plain)
+        self.__sbReadOnly.setFrameStyle(
+            QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
         self.__sbReadOnly.clicked.connect(self.__toggleReadOnlyMode)
 
         self.__showEditMode(self.__editor.overwriteMode())
@@ -1370,7 +1375,7 @@
         dlg.showConfigurationPageByName("hexEditorPage")
         dlg.exec()
         QCoreApplication.processEvents()
-        if dlg.result() == QDialog.Accepted:
+        if dlg.result() == QDialog.DialogCode.Accepted:
             dlg.setPreferences()
             Preferences.syncPreferences()
             self.__preferencesChangedByLocalPreferencesDialog()
--- a/eric6/HexEdit/HexEditSearchReplaceWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/HexEdit/HexEditSearchReplaceWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -469,7 +469,7 @@
         """
         Private slot to close the widget.
         """
-        self.__editor.setFocus(Qt.OtherFocusReason)
+        self.__editor.setFocus(Qt.FocusReason.OtherFocusReason)
         self.close()
 
     def keyPressEvent(self, event):
@@ -479,7 +479,7 @@
         @param event reference to the key press event
         @type QKeyEvent
         """
-        if event.key() == Qt.Key_Escape:
+        if event.key() == Qt.Key.Key_Escape:
             self.close()
     
     def __convertText(self, txt, oldFormat, newFormat):
--- a/eric6/HexEdit/HexEditWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/HexEdit/HexEditWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -134,10 +134,10 @@
             self.setFont(QFont("Monospace", 10))
         
         self.setAddressAreaColors(
-            self.palette().color(QPalette.WindowText),
+            self.palette().color(QPalette.ColorRole.WindowText),
             self.palette().alternateBase().color())
         self.setHighlightColors(
-            self.palette().color(QPalette.WindowText),
+            self.palette().color(QPalette.ColorRole.WindowText),
             QColor(0xff, 0xff, 0x99, 0xff))
         self.setSelectionColors(
             self.palette().highlightedText().color(),
@@ -1193,80 +1193,82 @@
         @type QKeyEvent
         """
         # Cursor movements
-        if evt.matches(QKeySequence.MoveToNextChar):
+        if evt.matches(QKeySequence.StandardKey.MoveToNextChar):
             self.moveCursorToNextChar()
-        elif evt.matches(QKeySequence.MoveToPreviousChar):
+        elif evt.matches(QKeySequence.StandardKey.MoveToPreviousChar):
             self.moveCursorToPreviousChar()
-        elif evt.matches(QKeySequence.MoveToEndOfLine):
+        elif evt.matches(QKeySequence.StandardKey.MoveToEndOfLine):
             self.moveCursorToEndOfLine()
-        elif evt.matches(QKeySequence.MoveToStartOfLine):
+        elif evt.matches(QKeySequence.StandardKey.MoveToStartOfLine):
             self.moveCursorToStartOfLine()
-        elif evt.matches(QKeySequence.MoveToPreviousLine):
+        elif evt.matches(QKeySequence.StandardKey.MoveToPreviousLine):
             self.moveCursorToPreviousLine()
-        elif evt.matches(QKeySequence.MoveToNextLine):
+        elif evt.matches(QKeySequence.StandardKey.MoveToNextLine):
             self.moveCursorToNextLine()
-        elif evt.matches(QKeySequence.MoveToNextPage):
+        elif evt.matches(QKeySequence.StandardKey.MoveToNextPage):
             self.moveCursorToNextPage()
-        elif evt.matches(QKeySequence.MoveToPreviousPage):
+        elif evt.matches(QKeySequence.StandardKey.MoveToPreviousPage):
             self.moveCursorToPreviousPage()
-        elif evt.matches(QKeySequence.MoveToEndOfDocument):
+        elif evt.matches(QKeySequence.StandardKey.MoveToEndOfDocument):
             self.moveCursorToEndOfDocument()
-        elif evt.matches(QKeySequence.MoveToStartOfDocument):
+        elif evt.matches(QKeySequence.StandardKey.MoveToStartOfDocument):
             self.moveCursorToStartOfDocument()
         
         # Selection commands
-        elif evt.matches(QKeySequence.SelectAll):
+        elif evt.matches(QKeySequence.StandardKey.SelectAll):
             self.selectAll()
-        elif evt.matches(QKeySequence.SelectNextChar):
+        elif evt.matches(QKeySequence.StandardKey.SelectNextChar):
             self.selectNextChar()
-        elif evt.matches(QKeySequence.SelectPreviousChar):
+        elif evt.matches(QKeySequence.StandardKey.SelectPreviousChar):
             self.selectPreviousChar()
-        elif evt.matches(QKeySequence.SelectEndOfLine):
+        elif evt.matches(QKeySequence.StandardKey.SelectEndOfLine):
             self.selectToEndOfLine()
-        elif evt.matches(QKeySequence.SelectStartOfLine):
+        elif evt.matches(QKeySequence.StandardKey.SelectStartOfLine):
             self.selectToStartOfLine()
-        elif evt.matches(QKeySequence.SelectPreviousLine):
+        elif evt.matches(QKeySequence.StandardKey.SelectPreviousLine):
             self.selectPreviousLine()
-        elif evt.matches(QKeySequence.SelectNextLine):
+        elif evt.matches(QKeySequence.StandardKey.SelectNextLine):
             self.selectNextLine()
-        elif evt.matches(QKeySequence.SelectNextPage):
+        elif evt.matches(QKeySequence.StandardKey.SelectNextPage):
             self.selectNextPage()
-        elif evt.matches(QKeySequence.SelectPreviousPage):
+        elif evt.matches(QKeySequence.StandardKey.SelectPreviousPage):
             self.selectPreviousPage()
-        elif evt.matches(QKeySequence.SelectEndOfDocument):
+        elif evt.matches(QKeySequence.StandardKey.SelectEndOfDocument):
             self.selectEndOfDocument()
-        elif evt.matches(QKeySequence.SelectStartOfDocument):
+        elif evt.matches(QKeySequence.StandardKey.SelectStartOfDocument):
             self.selectStartOfDocument()
         
         # Edit commands
-        elif evt.matches(QKeySequence.Copy):
+        elif evt.matches(QKeySequence.StandardKey.Copy):
             self.copy()
         elif (
-            evt.key() == Qt.Key_Insert and
-            evt.modifiers() == Qt.NoModifier
+            evt.key() == Qt.Key.Key_Insert and
+            evt.modifiers() == Qt.KeyboardModifier.NoModifier
         ):
             self.setOverwriteMode(not self.overwriteMode())
             self.setCursorPosition(self.__cursorPosition)
         
         elif not self.__readOnly:
-            if evt.matches(QKeySequence.Cut):
+            if evt.matches(QKeySequence.StandardKey.Cut):
                 self.cut()
-            elif evt.matches(QKeySequence.Paste):
+            elif evt.matches(QKeySequence.StandardKey.Paste):
                 self.paste()
-            elif evt.matches(QKeySequence.Delete):
+            elif evt.matches(QKeySequence.StandardKey.Delete):
                 self.deleteByte()
             elif (
-                evt.key() == Qt.Key_Backspace and
-                evt.modifiers() == Qt.NoModifier
+                evt.key() == Qt.Key.Key_Backspace and
+                evt.modifiers() == Qt.KeyboardModifier.NoModifier
             ):
                 self.deleteByteBack()
-            elif evt.matches(QKeySequence.Undo):
+            elif evt.matches(QKeySequence.StandardKey.Undo):
                 self.undo()
-            elif evt.matches(QKeySequence.Redo):
+            elif evt.matches(QKeySequence.StandardKey.Redo):
                 self.redo()
             
             elif QApplication.keyboardModifiers() in [
-                    Qt.NoModifier, Qt.KeypadModifier]:
+                Qt.KeyboardModifier.NoModifier,
+                Qt.KeyboardModifier.KeypadModifier
+            ]:
                 # some hex input
                 key = evt.text()
                 if key and key in "0123456789abcdef":
@@ -1337,7 +1339,7 @@
         self.viewport().update()
         cPos = self.cursorPositionFromPoint(evt.pos())
         if cPos >= 0:
-            if evt.modifiers() == Qt.ShiftModifier:
+            if evt.modifiers() == Qt.KeyboardModifier.ShiftModifier:
                 self.__setSelection(cPos)
             else:
                 self.__resetSelection(cPos)
@@ -1361,7 +1363,8 @@
             
             # draw some patterns if needed
             painter.fillRect(
-                evt.rect(), self.viewport().palette().color(QPalette.Base))
+                evt.rect(),
+                self.viewport().palette().color(QPalette.ColorRole.Base))
             if self.__addressArea:
                 painter.fillRect(
                     QRect(-pxOfsX, evt.rect().top(),
@@ -1370,12 +1373,12 @@
                     self.__addressAreaBrush)
             if self.__asciiArea:
                 linePos = self.__pxPosAsciiX - (self.__pxGapHexAscii // 2)
-                painter.setPen(Qt.gray)
+                painter.setPen(Qt.GlobalColor.gray)
                 painter.drawLine(linePos - pxOfsX, evt.rect().top(),
                                  linePos - pxOfsX, self.height())
             
             painter.setPen(
-                self.viewport().palette().color(QPalette.WindowText))
+                self.viewport().palette().color(QPalette.ColorRole.WindowText))
             
             # paint the address area
             if self.__addressArea:
@@ -1396,9 +1399,9 @@
             
             # paint hex and ascii area
             colStandard = QPen(
-                self.viewport().palette().color(QPalette.WindowText))
+                self.viewport().palette().color(QPalette.ColorRole.WindowText))
             
-            painter.setBackgroundMode(Qt.TransparentMode)
+            painter.setBackgroundMode(Qt.BGMode.TransparentMode)
             
             row = 0
             pxPosY = pxPosStartY
@@ -1412,7 +1415,8 @@
                     bPosLine + colIdx < len(self.__dataShown) and
                     colIdx < self.BYTES_PER_LINE
                 ):
-                    c = self.viewport().palette().color(QPalette.Base)
+                    c = self.viewport().palette().color(
+                        QPalette.ColorRole.Base)
                     painter.setPen(colStandard)
                     
                     posBa = self.__bPosFirst + bPosLine + colIdx
@@ -1476,14 +1480,15 @@
                 row += 1
                 pxPosY += self.__pxCharHeight
         
-        painter.setBackgroundMode(Qt.TransparentMode)
+        painter.setBackgroundMode(Qt.BGMode.TransparentMode)
         painter.setPen(
-            self.viewport().palette().color(QPalette.WindowText))
+            self.viewport().palette().color(QPalette.ColorRole.WindowText))
             
         # paint cursor
         if self.__blink and not self.__readOnly and self.isActiveWindow():
             painter.fillRect(
-                self.__cursorRect, self.palette().color(QPalette.WindowText))
+                self.__cursorRect,
+                self.palette().color(QPalette.ColorRole.WindowText))
         else:
             if self.__hexDataShown:
                 try:
--- a/eric6/IconEditor/IconEditorGrid.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/IconEditor/IconEditorGrid.py	Tue Mar 02 17:17:09 2021 +0100
@@ -123,10 +123,11 @@
         """
         super(IconEditorGrid, self).__init__(parent)
         
-        self.setAttribute(Qt.WA_StaticContents)
-        self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
+        self.setAttribute(Qt.WidgetAttribute.WA_StaticContents)
+        self.setSizePolicy(QSizePolicy.Policy.Minimum,
+                           QSizePolicy.Policy.Minimum)
         
-        self.__curColor = Qt.black
+        self.__curColor = Qt.GlobalColor.black
         self.__zoom = 12
         self.__curTool = self.Pencil
         self.__startPos = QPoint()
@@ -141,12 +142,14 @@
         self.__undoStack = QUndoStack(self)
         self.__currentUndoCmd = None
         
-        self.__image = QImage(32, 32, QImage.Format_ARGB32)
+        self.__image = QImage(32, 32, QImage.Format.Format_ARGB32)
         self.__image.fill(qRgba(0, 0, 0, 0))
         self.__markImage = QImage(self.__image)
         self.__markImage.fill(self.NoMarkColor.rgba())
         
-        self.__compositingMode = QPainter.CompositionMode_SourceOver
+        self.__compositingMode = (
+            QPainter.CompositionMode.CompositionMode_SourceOver
+        )
         self.__lastPos = (-1, -1)
         
         self.__gridEnabled = True
@@ -172,7 +175,7 @@
         """
         cursorsPath = os.path.join(os.path.dirname(__file__), "cursors")
         
-        self.__normalCursor = QCursor(Qt.ArrowCursor)
+        self.__normalCursor = QCursor(Qt.CursorShape.ArrowCursor)
         
         pix = QPixmap(os.path.join(cursorsPath, "colorpicker-cursor.xpm"))
         mask = pix.createHeuristicMask()
@@ -332,7 +335,8 @@
         @param clearUndo flag indicating to clear the undo stack (boolean)
         """
         if newImage != self.__image:
-            self.__image = newImage.convertToFormat(QImage.Format_ARGB32)
+            self.__image = newImage.convertToFormat(
+                QImage.Format.Format_ARGB32)
             self.update()
             self.updateGeometry()
             self.resize(self.sizeHint())
@@ -430,13 +434,13 @@
                 j += 1
         
         col = QColor("#aaa")
-        painter.setPen(Qt.DashLine)
+        painter.setPen(Qt.PenStyle.DashLine)
         for i in range(0, self.__image.width()):
             for j in range(0, self.__image.height()):
                 rect = self.__pixelRect(i, j)
                 if evt.region().intersects(rect):
                     color = QColor.fromRgba(self.__image.pixel(i, j))
-                    painter.fillRect(rect, QBrush(Qt.white))
+                    painter.fillRect(rect, QBrush(Qt.GlobalColor.white))
                     painter.fillRect(QRect(rect.topLeft(), rect.center()), col)
                     painter.fillRect(QRect(rect.center(), rect.bottomRight()),
                                      col)
@@ -468,7 +472,7 @@
         
         @param evt reference to the mouse event object (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton:
+        if evt.button() == Qt.MouseButton.LeftButton:
             if self.__isPasting:
                 self.__isPasting = False
                 self.editPaste(True)
@@ -519,11 +523,14 @@
         """
         self.positionChanged.emit(*self.__imageCoordinates(evt.pos()))
         
-        if self.__isPasting and not (evt.buttons() & Qt.LeftButton):
+        if (
+            self.__isPasting and
+            not (evt.buttons() & Qt.MouseButton.LeftButton)
+        ):
             self.__drawPasteRect(evt.pos())
             return
         
-        if evt.buttons() & Qt.LeftButton:
+        if evt.buttons() & Qt.MouseButton.LeftButton:
             if self.__curTool == self.Pencil:
                 self.__setImagePixel(evt.pos(), True)
                 self.setDirty(True)
@@ -541,7 +548,7 @@
         
         @param evt reference to the mouse event object (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton:
+        if evt.button() == Qt.MouseButton.LeftButton:
             if self.__curTool in [self.Pencil, self.Rubber]:
                 if self.__currentUndoCmd:
                     self.__currentUndoCmd.setAfterImage(self.__image)
@@ -831,7 +838,7 @@
         img = QApplication.clipboard().image()
         ok = not img.isNull()
         if ok:
-            img = img.convertToFormat(QImage.Format_ARGB32)
+            img = img.convertToFormat(QImage.Format.Format_ARGB32)
         
         return img, ok
     
@@ -846,7 +853,7 @@
             cmd = IconEditCommand(self, self.tr("Cut Selection"),
                                   self.__image)
         
-        img = QImage(self.__selRect.size(), QImage.Format_ARGB32)
+        img = QImage(self.__selRect.size(), QImage.Format.Format_ARGB32)
         img.fill(qRgba(0, 0, 0, 0))
         for i in range(0, self.__selRect.width()):
             for j in range(0, self.__selRect.height()):
@@ -987,7 +994,7 @@
         from .IconSizeDialog import IconSizeDialog
         dlg = IconSizeDialog(self.__image.width(), self.__image.height())
         res = dlg.exec()
-        if res == QDialog.Accepted:
+        if res == QDialog.DialogCode.Accepted:
             newWidth, newHeight = dlg.getData()
             if (
                 newWidth != self.__image.width() or
@@ -996,8 +1003,8 @@
                 cmd = IconEditCommand(self, self.tr("Resize Image"),
                                       self.__image)
                 img = self.__image.scaled(
-                    newWidth, newHeight, Qt.IgnoreAspectRatio,
-                    Qt.SmoothTransformation)
+                    newWidth, newHeight, Qt.AspectRatioMode.IgnoreAspectRatio,
+                    Qt.TransformationMode.SmoothTransformation)
                 self.setIconImage(img)
                 self.setDirty(True)
                 self.__undoStack.push(cmd)
@@ -1010,9 +1017,9 @@
         from .IconSizeDialog import IconSizeDialog
         dlg = IconSizeDialog(self.__image.width(), self.__image.height())
         res = dlg.exec()
-        if res == QDialog.Accepted:
+        if res == QDialog.DialogCode.Accepted:
             width, height = dlg.getData()
-            img = QImage(width, height, QImage.Format_ARGB32)
+            img = QImage(width, height, QImage.Format.Format_ARGB32)
             img.fill(qRgba(0, 0, 0, 0))
             self.setIconImage(img)
     
--- a/eric6/IconEditor/IconEditorPalette.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/IconEditor/IconEditorPalette.py	Tue Mar 02 17:17:09 2021 +0100
@@ -34,17 +34,18 @@
         """
         super(IconEditorPalette, self).__init__(parent)
         
-        if self.layoutDirection == Qt.Horizontal:
-            direction = QBoxLayout.LeftToRight
+        if self.layoutDirection == Qt.Orientation.Horizontal:
+            direction = QBoxLayout.Direction.LeftToRight
         else:
-            direction = QBoxLayout.TopToBottom
+            direction = QBoxLayout.Direction.TopToBottom
         self.__layout = QBoxLayout(direction, self)
         self.setLayout(self.__layout)
         
         self.__preview = QLabel(self)
-        self.__preview.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+        self.__preview.setFrameStyle(QFrame.Shape.Panel | QFrame.Shadow.Sunken)
         self.__preview.setFixedHeight(64)
-        self.__preview.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.__preview.setAlignment(
+            Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
         self.__preview.setWhatsThis(self.tr(
             """<b>Preview</b>"""
             """<p>This is a 1:1 preview of the current icon.</p>"""
@@ -52,9 +53,10 @@
         self.__layout.addWidget(self.__preview)
         
         self.__color = QLabel(self)
-        self.__color.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+        self.__color.setFrameStyle(QFrame.Shape.Panel | QFrame.Shadow.Sunken)
         self.__color.setFixedHeight(24)
-        self.__color.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.__color.setAlignment(
+            Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
         self.__color.setWhatsThis(self.tr(
             """<b>Current Color</b>"""
             """<p>This is the currently selected color used for drawing.</p>"""
@@ -62,7 +64,8 @@
         self.__layout.addWidget(self.__color)
         
         self.__colorTxt = QLabel(self)
-        self.__colorTxt.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
+        self.__colorTxt.setAlignment(
+            Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
         self.__colorTxt.setWhatsThis(self.tr(
             """<b>Current Color Value</b>"""
             """<p>This is the currently selected color value used for"""
@@ -113,7 +116,7 @@
         self.__layout.addWidget(self.__compositingGroup)
         
         spacer = QSpacerItem(
-            10, 10, QSizePolicy.Minimum, QSizePolicy.Expanding)
+            10, 10, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
         self.__layout.addItem(spacer)
     
     def previewChanged(self, pixmap):
@@ -170,9 +173,9 @@
         
         @param mode compositing mode to set (QPainter.CompositionMode)
         """
-        if mode == QPainter.CompositionMode_Source:
+        if mode == QPainter.CompositionMode.CompositionMode_Source:
             self.__sourceButton.setChecked(True)
-        elif mode == QPainter.CompositionMode_SourceOver:
+        elif mode == QPainter.CompositionMode.CompositionMode_SourceOver:
             self.__sourceOverButton.setChecked(True)
     
     def __compositingChanged(self, on):
@@ -185,7 +188,7 @@
         if on:
             if self.__sourceButton.isChecked():
                 self.compositingChanged.emit(
-                    QPainter.CompositionMode_Source)
+                    QPainter.CompositionMode.CompositionMode_Source)
             elif self.__sourceOverButton.isChecked():
                 self.compositingChanged.emit(
-                    QPainter.CompositionMode_SourceOver)
+                    QPainter.CompositionMode.CompositionMode_SourceOver)
--- a/eric6/IconEditor/IconEditorWindow.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/IconEditor/IconEditorWindow.py	Tue Mar 02 17:17:09 2021 +0100
@@ -69,7 +69,8 @@
             self.__editor = IconEditorGrid()
             self.__scrollArea = QScrollArea()
             self.__scrollArea.setWidget(self.__editor)
-            self.__scrollArea.viewport().setBackgroundRole(QPalette.Dark)
+            self.__scrollArea.viewport().setBackgroundRole(
+                QPalette.ColorRole.Dark)
             self.__scrollArea.viewport().setAutoFillBackground(True)
             self.setCentralWidget(self.__scrollArea)
             
@@ -115,7 +116,7 @@
             self.__lastOpenPath = ""
             self.__lastSavePath = ""
             
-            self.grabGesture(Qt.PinchGesture)
+            self.grabGesture(Qt.GestureType.PinchGesture)
     
     def __initFileFilters(self):
         """
@@ -994,11 +995,17 @@
         self.__paletteDock = QDockWidget(self)
         self.__paletteDock.setObjectName("paletteDock")
         self.__paletteDock.setFeatures(
-            QDockWidget.DockWidgetFeatures(QDockWidget.AllDockWidgetFeatures))
+            QDockWidget.DockWidgetFeatures(
+                QDockWidget.DockWidgetFeature.DockWidgetClosable |
+                QDockWidget.DockWidgetFeature.DockWidgetMovable |
+                QDockWidget.DockWidgetFeature.DockWidgetFloatable
+            )
+        )
         self.__paletteDock.setWindowTitle("Palette")
         self.__palette = IconEditorPalette()
         self.__paletteDock.setWidget(self.__palette)
-        self.addDockWidget(Qt.RightDockWidgetArea, self.__paletteDock)
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea,
+                           self.__paletteDock)
     
     def closeEvent(self, evt):
         """
@@ -1351,7 +1358,7 @@
         
         @param evt reference to the wheel event (QWheelEvent)
         """
-        if evt.modifiers() & Qt.ControlModifier:
+        if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
             delta = evt.angleDelta().y()
             if delta < 0:
                 self.__zoomOut()
@@ -1369,7 +1376,7 @@
         @param evt reference to the event (QEvent)
         @return flag indicating, if the event was handled (boolean)
         """
-        if evt.type() == QEvent.Gesture:
+        if evt.type() == QEvent.Type.Gesture:
             self.gestureEvent(evt)
             return True
         
@@ -1381,11 +1388,11 @@
         
         @param evt reference to the gesture event (QGestureEvent
         """
-        pinch = evt.gesture(Qt.PinchGesture)
+        pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:
-            if pinch.state() == Qt.GestureStarted:
+            if pinch.state() == Qt.GestureState.GestureStarted:
                 pinch.setTotalScaleFactor(self.__editor.zoomFactor() / 100.0)
-            elif pinch.state() == Qt.GestureUpdated:
+            elif pinch.state() == Qt.GestureState.GestureUpdated:
                 self.__editor.setZoomFactor(
                     int(pinch.totalScaleFactor() * 100))
                 self.__updateZoom()
--- a/eric6/MicroPython/AddEditDevicesDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/AddEditDevicesDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -67,7 +67,7 @@
             self.dataVolumeEdit.setText("")
             self.flashVolumeEdit.setText("")
         
-        self.deviceTypeComboBox.setFocus(Qt.OtherFocusReason)
+        self.deviceTypeComboBox.setFocus(Qt.FocusReason.OtherFocusReason)
         
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
@@ -81,7 +81,8 @@
         @type int
         """
         board = self.deviceTypeComboBox.currentData()
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(bool(board))
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(bool(board))
         self.reportButton.setEnabled(bool(board))
     
     @pyqtSlot()
--- a/eric6/MicroPython/ConnectionSelectionDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/ConnectionSelectionDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -21,8 +21,8 @@
     Class implementing a dialog to select the port to connect to and the type
     of the attached device.
     """
-    PortNameRole = Qt.UserRole
-    VidPidRole = Qt.UserRole + 1
+    PortNameRole = Qt.ItemDataRole.UserRole
+    VidPidRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, ports, currentPort, currentType, parent=None):
         """
@@ -79,7 +79,7 @@
         """
         Private method to update the status of the OK button.
         """
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(
             bool(self.portNameComboBox.currentData(self.PortNameRole)) and
             bool(self.deviceTypeComboBox.currentData())
         )
--- a/eric6/MicroPython/EspBackupRestoreFirmwareDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/EspBackupRestoreFirmwareDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -95,7 +95,8 @@
             enable &= bool(self.sizeComboBox.currentText())
         else:
             enable &= os.path.exists(firmwareFile)
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
     
     @pyqtSlot(str)
     def on_espComboBox_currentTextChanged(self, chip):
--- a/eric6/MicroPython/EspDevices.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/EspDevices.py	Tue Mar 02 17:17:09 2021 +0100
@@ -200,7 +200,7 @@
         """
         from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog
         dlg = EspFirmwareSelectionDialog()
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             chip, firmware, flashMode, _ = dlg.getData()
             if chip == "esp8266":
                 flashAddress = "0x0000"
@@ -238,7 +238,7 @@
         """
         from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog
         dlg = EspFirmwareSelectionDialog(addon=True)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             chip, firmware, flashMode, flashAddress = dlg.getData()
             flashArgs = [
                 "-u",
@@ -271,7 +271,7 @@
             EspBackupRestoreFirmwareDialog
         )
         dlg = EspBackupRestoreFirmwareDialog(backupMode=True)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             chip, flashSize, flashMode, firmware = dlg.getData()
             flashArgs = [
                 "-u",
@@ -298,7 +298,7 @@
             EspBackupRestoreFirmwareDialog
         )
         dlg = EspBackupRestoreFirmwareDialog(backupMode=False)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             chip, flashSize, flashMode, firmware = dlg.getData()
             flashArgs = [
                 "-u",
--- a/eric6/MicroPython/EspFirmwareSelectionDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/EspFirmwareSelectionDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -76,7 +76,8 @@
                   bool(firmwareFile) and os.path.exists(firmwareFile))
         if self.__addon:
             enable &= bool(self.addressEdit.text())
-        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(enable)
     
     @pyqtSlot(str)
     def on_espComboBox_currentTextChanged(self, chip):
--- a/eric6/MicroPython/MicroPythonCommandsInterface.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/MicroPythonCommandsInterface.py	Tue Mar 02 17:17:09 2021 +0100
@@ -165,7 +165,8 @@
             if self.__serial.hasTimedOut():
                 return False
         
-        QCoreApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
+        QCoreApplication.processEvents(
+            QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
         self.__serial.readAll()             # read all data and discard it
         return True
     
@@ -216,7 +217,7 @@
                 commandBytes = command.encode("utf-8")
                 self.__serial.write(commandBytes + b"\x04")
                 QCoreApplication.processEvents(
-                    QEventLoop.ExcludeUserInputEvents)
+                    QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
                 ok = self.__serial.readUntil(b"OK")
                 if ok != b"OK":
                     return (
--- a/eric6/MicroPython/MicroPythonFileManagerWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/MicroPython/MicroPythonFileManagerWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -79,9 +79,9 @@
         self.getAsButton.setEnabled(False)
         
         self.localFileTreeWidget.header().setSortIndicator(
-            0, Qt.AscendingOrder)
+            0, Qt.SortOrder.AscendingOrder)
         self.deviceFileTreeWidget.header().setSortIndicator(
-            0, Qt.AscendingOrder)
+            0, Qt.SortOrder.AscendingOrder)
         
         self.__progressInfoDialog = None
         self.__fileManager = MicroPythonFileManager(commandsInterface, self)
@@ -220,10 +220,10 @@
         for name, mode, size, dateTime in filesList:
             itm = QTreeWidgetItem(self.deviceFileTreeWidget,
                                   [name, mode, size, dateTime])
-            itm.setTextAlignment(1, Qt.AlignHCenter)
-            itm.setTextAlignment(2, Qt.AlignRight)
+            itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
+            itm.setTextAlignment(2, Qt.AlignmentFlag.AlignRight)
         self.deviceFileTreeWidget.header().resizeSections(
-            QHeaderView.ResizeToContents)
+            QHeaderView.ResizeMode.ResizeToContents)
     
     def __listLocalFiles(self, dirname="", localDevice=False):
         """
@@ -258,10 +258,10 @@
         fileTreeWidget.clear()
         for item in filesList:
             itm = QTreeWidgetItem(fileTreeWidget, item)
-            itm.setTextAlignment(1, Qt.AlignHCenter)
-            itm.setTextAlignment(2, Qt.AlignRight)
+            itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
+            itm.setTextAlignment(2, Qt.AlignmentFlag.AlignRight)
         fileTreeWidget.header().resizeSections(
-            QHeaderView.ResizeToContents)
+            QHeaderView.ResizeMode.ResizeToContents)
     
     @pyqtSlot(QTreeWidgetItem, int)
     def on_localFileTreeWidget_itemActivated(self, item, column):
@@ -444,7 +444,7 @@
                         self,
                         self.tr("Put File As"),
                         self.tr("Enter a new name for the file"),
-