Mercurial Repositories > eric / changeset

--- a/.hgtags	Tue Apr 12 18:47:49 2016 +0200
+++ b/.hgtags	Tue Apr 12 18:48:33 2016 +0200
@@ -28,3 +28,4 @@
 75ba4ce4a589c1042bf99426bacdc7beccd1001d release-6.1.1
 7c4325c061e4f39e35a9f32adc97298607c98eae release-6.1.2
 4ba9e5ae764b4add5282f06897e42acd4d27ffc2 release-6.1.3
+8bd5f4ac55dcb9ced566667c7ff00ea77ee9631f release-6.1.4

--- a/UI/Previewers/PreviewerHTML.py	Tue Apr 12 18:47:49 2016 +0200
+++ b/UI/Previewers/PreviewerHTML.py	Tue Apr 12 18:48:33 2016 +0200
@@ -208,6 +208,8 @@
             self.previewView.page().loadFinished.connect(
                 self.__restoreScrollBarPositions)
         self.previewView.setHtml(html, baseUrl=QUrl.fromLocalFile(filePath))
+        if self.__previewedEditor:
+            self.__previewedEditor.setFocus()
     
     @pyqtSlot(str)
     def on_previewView_titleChanged(self, title):

--- a/changelog	Tue Apr 12 18:47:49 2016 +0200
+++ b/changelog	Tue Apr 12 18:48:33 2016 +0200
@@ -1,5 +1,8 @@
 Change Log
 ----------
+Version 6.1.4:
+- bug fixes
+
 Version 6.1.3:
 - bug fixes
 

--- a/eric6_doc.py	Tue Apr 12 18:47:49 2016 +0200
+++ b/eric6_doc.py	Tue Apr 12 18:48:33 2016 +0200
@@ -268,10 +268,6 @@
             qtHelpTitle == ""):
         usage()
     
-    if qtHelpCreation:
-        from PyQt5.QtCore import QCoreApplication
-        app = QCoreApplication(sys.argv)    # __IGNORE_WARNING__
-
     input = output = 0
     basename = ""