Mercurial Repositories > eric / file diff

--- a/eric6/Documentation/Help/source.qhp	Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Documentation/Help/source.qhp	Tue Dec 22 19:59:29 2020 +0100
@@ -849,7 +849,8 @@
             <section title="eric6.Project.SpellingPropertiesDialog" ref="eric6.Project.SpellingPropertiesDialog.html" />
             <section title="eric6.Project.TranslationPropertiesDialog" ref="eric6.Project.TranslationPropertiesDialog.html" />
             <section title="eric6.Project.UicCompilerOptionsDialog" ref="eric6.Project.UicCompilerOptionsDialog.html" />
-            <section title="eric6.Project.UicLoadUi" ref="eric6.Project.UicLoadUi.html" />
+            <section title="eric6.Project.UicLoadUi5" ref="eric6.Project.UicLoadUi5.html" />
+            <section title="eric6.Project.UicLoadUi6" ref="eric6.Project.UicLoadUi6.html" />
             <section title="eric6.Project.UserPropertiesDialog" ref="eric6.Project.UserPropertiesDialog.html" />
           </section>
           <section title="eric6.PyUnit" ref="index-eric6.PyUnit.html">
@@ -12319,7 +12320,13 @@
       <keyword name="QtPage" id="QtPage" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage" />
       <keyword name="QtPage (Constructor)" id="QtPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.__init__" />
       <keyword name="QtPage (Module)" id="QtPage (Module)" ref="eric6.Preferences.ConfigurationPages.QtPage.html" />
+      <keyword name="QtPage.__populateAndSetVenvComboBox" id="QtPage.__populateAndSetVenvComboBox" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.__populateAndSetVenvComboBox" />
+      <keyword name="QtPage.__populateAndSetVenvComboBoxes" id="QtPage.__populateAndSetVenvComboBoxes" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.__populateAndSetVenvComboBoxes" />
+      <keyword name="QtPage.__showVirtualEnvManager" id="QtPage.__showVirtualEnvManager" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.__showVirtualEnvManager" />
       <keyword name="QtPage.__updateQtSample" id="QtPage.__updateQtSample" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.__updateQtSample" />
+      <keyword name="QtPage.on_pyqt5VenvDlgButton_clicked" id="QtPage.on_pyqt5VenvDlgButton_clicked" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.on_pyqt5VenvDlgButton_clicked" />
+      <keyword name="QtPage.on_pyqt6VenvDlgButton_clicked" id="QtPage.on_pyqt6VenvDlgButton_clicked" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.on_pyqt6VenvDlgButton_clicked" />
+      <keyword name="QtPage.on_pyside2VenvDlgButton_clicked" id="QtPage.on_pyside2VenvDlgButton_clicked" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.on_pyside2VenvDlgButton_clicked" />
       <keyword name="QtPage.on_qtPostfixEdit_textChanged" id="QtPage.on_qtPostfixEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qtPostfixEdit_textChanged" />
       <keyword name="QtPage.on_qtPrefixEdit_textChanged" id="QtPage.on_qtPrefixEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qtPrefixEdit_textChanged" />
       <keyword name="QtPage.save" id="QtPage.save" ref="eric6.Preferences.ConfigurationPages.QtPage.html#QtPage.save" />
@@ -15224,7 +15231,8 @@
       <keyword name="UicCompilerOptionsDialog (Constructor)" id="UicCompilerOptionsDialog (Constructor)" ref="eric6.Project.UicCompilerOptionsDialog.html#UicCompilerOptionsDialog.__init__" />
       <keyword name="UicCompilerOptionsDialog (Module)" id="UicCompilerOptionsDialog (Module)" ref="eric6.Project.UicCompilerOptionsDialog.html" />
       <keyword name="UicCompilerOptionsDialog.getData" id="UicCompilerOptionsDialog.getData" ref="eric6.Project.UicCompilerOptionsDialog.html#UicCompilerOptionsDialog.getData" />
-      <keyword name="UicLoadUi (Module)" id="UicLoadUi (Module)" ref="eric6.Project.UicLoadUi.html" />
+      <keyword name="UicLoadUi5 (Module)" id="UicLoadUi5 (Module)" ref="eric6.Project.UicLoadUi5.html" />
+      <keyword name="UicLoadUi6 (Module)" id="UicLoadUi6 (Module)" ref="eric6.Project.UicLoadUi6.html" />
       <keyword name="UniqueNamespace" id="UniqueNamespace" ref="eric6.E5Network.E5RFC6266.html#UniqueNamespace" />
       <keyword name="UniqueNamespace.__setitem__" id="UniqueNamespace.__setitem__" ref="eric6.E5Network.E5RFC6266.html#UniqueNamespace.__setitem__" />
       <keyword name="UnittestDialog" id="UnittestDialog" ref="eric6.PyUnit.UnittestDialog.html#UnittestDialog" />
@@ -17050,7 +17058,8 @@
       <keyword name="__initializeCondaInterface" id="__initializeCondaInterface" ref="eric6.CondaInterface.__init__.html#__initializeCondaInterface" />
       <keyword name="__jsSyntaxCheck" id="__jsSyntaxCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#__jsSyntaxCheck" />
       <keyword name="__jsonSyntaxCheck" id="__jsonSyntaxCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsonCheckSyntax.html#__jsonSyntaxCheck" />
-      <keyword name="__mapType" id="__mapType" ref="eric6.Project.UicLoadUi.html#__mapType" />
+      <keyword name="__mapType" id="__mapType" ref="eric6.Project.UicLoadUi5.html#__mapType" />
+      <keyword name="__mapType" id="__mapType" ref="eric6.Project.UicLoadUi6.html#__mapType" />
       <keyword name="__messageBox" id="__messageBox" ref="eric6.E5Gui.E5MessageBox.html#__messageBox" />
       <keyword name="__pyName" id="__pyName" ref="compileUiFiles.html#__pyName" />
       <keyword name="__pyName" id="__pyName" ref="eric6.Utilities.uic.html#__pyName" />
@@ -17149,7 +17158,8 @@
       <keyword name="checkTryExceptPass" id="checkTryExceptPass" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.tryExcept.html#checkTryExceptPass" />
       <keyword name="checkWeakCryptographicKey" id="checkWeakCryptographicKey" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.weakCryptographicKey.html#checkWeakCryptographicKey" />
       <keyword name="checkYamlLoad" id="checkYamlLoad" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.yamlLoad.html#checkYamlLoad" />
-      <keyword name="className" id="className" ref="eric6.Project.UicLoadUi.html#className" />
+      <keyword name="className" id="className" ref="eric6.Project.UicLoadUi5.html#className" />
+      <keyword name="className" id="className" ref="eric6.Project.UicLoadUi6.html#className" />
       <keyword name="cleanUp" id="cleanUp" ref="install-debugclients.html#cleanUp" />
       <keyword name="cleanUp" id="cleanUp" ref="install.html#cleanUp" />
       <keyword name="cleanUpLinuxSpecifics" id="cleanUpLinuxSpecifics" ref="install.html#cleanUpLinuxSpecifics" />
@@ -17812,7 +17822,8 @@
       <keyword name="normcaseabspath" id="normcaseabspath" ref="eric6.Utilities.__init__.html#normcaseabspath" />
       <keyword name="normcasepath" id="normcasepath" ref="eric6.Utilities.__init__.html#normcasepath" />
       <keyword name="normjoinpath" id="normjoinpath" ref="eric6.Utilities.__init__.html#normjoinpath" />
-      <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi.html#objectName" />
+      <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi5.html#objectName" />
+      <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi6.html#objectName" />
       <keyword name="okToClearData" id="okToClearData" ref="eric6.E5Gui.E5MessageBox.html#okToClearData" />
       <keyword name="open_with_encoding" id="open_with_encoding" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.eradicate.html#open_with_encoding" />
       <keyword name="parseEnvironmentString" id="parseEnvironmentString" ref="eric6.Utilities.__init__.html#parseEnvironmentString" />
@@ -18004,7 +18015,8 @@
       <keyword name="shouldResetLayout" id="shouldResetLayout" ref="eric6.Preferences.__init__.html#shouldResetLayout" />
       <keyword name="shutilCopy" id="shutilCopy" ref="install-debugclients.html#shutilCopy" />
       <keyword name="shutilCopy" id="shutilCopy" ref="install.html#shutilCopy" />
-      <keyword name="signatures" id="signatures" ref="eric6.Project.UicLoadUi.html#signatures" />
+      <keyword name="signatures" id="signatures" ref="eric6.Project.UicLoadUi5.html#signatures" />
+      <keyword name="signatures" id="signatures" ref="eric6.Project.UicLoadUi6.html#signatures" />
       <keyword name="simpleAppStartup" id="simpleAppStartup" ref="eric6.Toolbox.Startup.html#simpleAppStartup" />
       <keyword name="sort" id="sort" ref="eric6.Graphics.GraphicsUtilities.html#sort" />
       <keyword name="speedString" id="speedString" ref="eric6.WebBrowser.Download.DownloadUtilities.html#speedString" />
@@ -18808,7 +18820,8 @@
       <file>eric6.Project.SpellingPropertiesDialog.html</file>
       <file>eric6.Project.TranslationPropertiesDialog.html</file>
       <file>eric6.Project.UicCompilerOptionsDialog.html</file>
-      <file>eric6.Project.UicLoadUi.html</file>
+      <file>eric6.Project.UicLoadUi5.html</file>
+      <file>eric6.Project.UicLoadUi6.html</file>
       <file>eric6.Project.UserPropertiesDialog.html</file>
       <file>eric6.PyUnit.UnittestDialog.html</file>
       <file>eric6.QScintilla.APIsManager.html</file>