Merge from 3.x: PR #4749

Fixes #3609

spyder/app/mainwindow.py

@@ -2807,14 +2807,12 @@ def _check_updates_ready(self):
         url_i = 'http://pythonhosted.org/spyder/installation.html'
 
         # Define the custom QMessageBox
-        box = MessageCheckBox()
+        box = MessageCheckBox(icon=QMessageBox.Information,
+                              parent=self)
         box.setWindowTitle(_("Spyder updates"))
         box.set_checkbox_text(_("Check for updates on startup"))
         box.setStandardButtons(QMessageBox.Ok)
         box.setDefaultButton(QMessageBox.Ok)
-        # The next line is commented because it freezes the dialog.
-        # For now there is then no info icon. This solves issue #3609.
-        # box.setIcon(QMessageBox.Information)
 
         # Adjust the checkbox depending on the stored configuration
         section, option = 'main', 'check_updates_on_startup'

spyder/widgets/helperwidgets.py

@@ -9,6 +9,7 @@
 """
 
 # Third party imports
+from qtpy import PYQT5
 from qtpy.QtCore import QPoint, QSize, Qt
 from qtpy.QtGui import QAbstractTextDocumentLayout, QPainter, QTextDocument
 from qtpy.QtWidgets import (QApplication, QCheckBox, QLineEdit, QMessageBox,
@@ -72,7 +73,10 @@ def __init__(self, *args, **kwargs):
 
         # Access the Layout of the MessageBox to add the Checkbox
         layout = self.layout()
-        layout.addLayout(check_layout, 1, 1)
+        if PYQT5:
+            layout.addLayout(check_layout, 1, 2)
+        else:
+            layout.addLayout(check_layout, 1, 1)
 
     # --- Public API
     # Methods to access the checkbox