Merged with default branch to prepare a new release.
diff -r 93a6141ecbf1 -r 331ac8f99cf8 .hgtags
--- a/.hgtags Sat Dec 01 11:39:28 2018 +0100
+++ b/.hgtags Sat Dec 01 11:44:34 2018 +0100
@@ -25,3 +25,33 @@
7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1
8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11
112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1
+d2bef1e78194dabd24defbac1179bb2b6372cc2a release-16.12
+5e79ebb03b102c47038b3c568495f9aa511d5584 release-17.01
+b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02
+b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02
+3ad8620b828b6d8490891c8898e9a16dee50a866 release-17.02
+3790c6f62c5cad71a8c560c0bd8849da4f9dd5e5 release-17.02.1
+106581f40cc26a68ceb8d995828dca004d7dbf3a release-17.03
+63eb46a7c3e8b5c7a38bb100438bd1e6c4c4f9de release-17.03.1
+be30320a29bccd9dd4019ad36cc4aeffa48437d3 release-17.04
+27f8227ba598052663c6b2f40bcdad866f7473f1 release-17.04.1
+6422afc7adc4ec10f7b8eeea13ff207989cc03ba release-17.05
+1860eca908e4ce5c8256c5cfdd51d8f950301063 release-17.06
+49ba4a9f04215068aea6c5a51634b1445250326b release-17.07
+9487c08b6a23001f6d251623d7f30f58511cf85a release-17.08
+0752bdd8db779f43dd2d973651650169d4e0a8a4 release-17.09
+5228afbb870f86fa5fd187f7065c8f7ba0187fe6 release-17.10
+7fa6400debb4015b16cba425a2ab0d9f7848c569 release-17.11
+a604749f4fcc8762d769243f8e35854c75df8708 release-17.11.1
+548a9ba8c97052fd5dda3faba9ae2e341d289092 release-17.12
+bfc5153d02243ee750035c97029e381a0af26578 release-18.01
+55bb393343226408a330aca14d4270aed217d53c release-18.02
+89dc65b937cc6c04eccb0bfa70cff7408607fb83 release-18.03
+a02b03b7bfec915a89b53ba95a3fb26485561d2b release-18.04
+0daf79d65080a4d8119dc2b9debc54031a9f75cf release-18.05
+df201b9fbad4dade97a9bc12ead6268cf8c5d873 release-18.06
+8aa2d6b96303f20671edf4572eb3c60c37fd0e43 release-18.07
+22a6fc33ab6dd7ee4d812487090161bd89776b78 release-18.08
+7bbc72701f0ace6df46dd7f9e313d33b19f228d9 release-18.09
+ca6d66fee883916904ad231fdd92caf7efe7cbe5 release-18.10
+b4aeb61b3e3c0cdcdd33e02894288bb106ca1d8e release-18.11
diff -r 93a6141ecbf1 -r 331ac8f99cf8 APIs/Python3/eric6.api
diff -r 93a6141ecbf1 -r 331ac8f99cf8 DebugClients/Python/ThreadExtension.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Debugger/DebugServer.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Documentation/Help/source.qch
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Documentation/Help/source.qhp
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Documentation/Source/eric6.QScintilla.Editor.html
diff -r 93a6141ecbf1 -r 331ac8f99cf8 E5Gui/E5TextEditSearchWidget.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 E5Gui/E5ZoomWidget.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 E5Network/data/tld_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Graphics/UMLGraphicsView.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/Bookmarks/DefaultBookmarks_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/HelpBrowserWV.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/data/html_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/data/icons_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Helpviewer/data/javascript_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 IconEditor/cursors/cursors_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Plugins/ViewManagerPlugins/Listspace/Listspace.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Plugins/ViewManagerPlugins/Tabview/Tabview.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Preferences/ConfigurationDialog.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Preferences/ConfigurationPages/EditorAutocompletionPage.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Preferences/ConfigurationPages/EditorAutocompletionPage.ui
diff -r 93a6141ecbf1 -r 331ac8f99cf8 Preferences/__init__.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 QScintilla/Editor.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 QScintilla/Shell.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 UI/Previewers/PreviewerHTML.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 UI/UserInterface.py
--- a/UI/UserInterface.py Sat Dec 01 11:39:28 2018 +0100
+++ b/UI/UserInterface.py Sat Dec 01 11:44:34 2018 +0100
@@ -650,9 +650,8 @@
self.inCloseEvent = False
# now redirect stdout and stderr
- # TODO: release - reenable redirection
-## sys.stdout = self.stdout
-## sys.stderr = self.stderr
+ sys.stdout = self.stdout
+ sys.stderr = self.stderr
# now fire up the single application server
if Preferences.getUI("SingleApplicationMode"):
diff -r 93a6141ecbf1 -r 331ac8f99cf8 UI/data/codeDocumentationViewer_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 ViewManager/ViewManager.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/Bookmarks/DefaultBookmarks_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/Download/DownloadItem.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/Network/NetworkManager.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/Network/QtHelpSchemeHandler.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/WebBrowserView.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/data/html_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/data/icons_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 WebBrowser/data/javascript_rc.py
diff -r 93a6141ecbf1 -r 331ac8f99cf8 changelog
diff -r 93a6141ecbf1 -r 331ac8f99cf8 eric6.e4p
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_cs.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_de.qm
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_de.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_empty.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_en.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_es.qm
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_es.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_fr.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_it.qm
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_it.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_pt.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_ru.qm
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_ru.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_tr.ts
diff -r 93a6141ecbf1 -r 331ac8f99cf8 i18n/eric6_zh_CN.ts