Rename qt4.py to qt.py, as it now supports Qt 5 as well (cztomczak#325).

cztomczak · cztomczak · commit df798e535093 · 2017-04-20T15:27:48.000+02:00
Update docs and tools.
diff --git a/examples/Examples-README.md b/examples/Examples-README.md
@@ -30,8 +30,9 @@ maintained:
   library (GTK 2)
 - [gtk3.py](gtk3.py): example for [PyGObject/PyGI](https://wiki.gnome.org/Projects/PyGObject)
   library (GTK 3). Currently broken on Linux/Mac, see top comments in sources.
-- [qt4.py](qt4.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4)
-  and [PySide](https://wiki.qt.io/PySide) libraries (Qt 4)
+- [qt.py](qt.py): example for [PyQt4](https://wiki.python.org/moin/PyQt4),
+  [PyQt5](https://pypi.python.org/pypi/PyQt5)
+  and [PySide](https://wiki.qt.io/PySide) libraries
 - [tkinter_.py](tkinter_.py): example for [Tkinter](https://wiki.python.org/moin/TkInter).
   Currently broken on Mac.
 - [wxpython.py](wxpython.py): example for [wxPython](https://wxpython.org/)
diff --git a/examples/qt.py b/examples/qt.py
@@ -43,9 +43,9 @@
     from PySide.QtCore import *
 else:
     print("USAGE:")
-    print("  qt4.py pyqt4")
-    print("  qt4.py pyqt5")
-    print("  qt4.py pyside")
+    print("  qt.py pyqt4")
+    print("  qt.py pyqt5")
+    print("  qt.py pyside")
     sys.exit(1)
 
 # Fix for PyCharm hints warnings when using static methods
@@ -83,14 +83,14 @@ def main():
 
 
 def check_versions():
-    print("[qt4.py] CEF Python {ver}".format(ver=cef.__version__))
-    print("[qt4.py] Python {ver} {arch}".format(
+    print("[qt.py] CEF Python {ver}".format(ver=cef.__version__))
+    print("[qt.py] Python {ver} {arch}".format(
             ver=platform.python_version(), arch=platform.architecture()[0]))
     if PYQT4 or PYQT5:
-        print("[qt4.py] PyQt {v1} (qt {v2})".format(
+        print("[qt.py] PyQt {v1} (qt {v2})".format(
               v1=PYQT_VERSION_STR, v2=qVersion()))
     elif PYSIDE:
-        print("[qt4.py] PySide {v1} (qt {v2})".format(
+        print("[qt.py] PySide {v1} (qt {v2})".format(
               v1=PySide.__version__, v2=QtCore.__version__))
     # CEF Python version requirement
     assert cef.__version__ >= "55.4", "CEF Python v55.4+ required to run this"
@@ -265,7 +265,7 @@ def OnLoadStart(self, browser, **_):
             self.navigation_bar.cef_widget.setFocus()
             # Temporary fix no. 2 for focus issue on Linux (Issue #284)
             if LINUX:
-                print("[qt4.py] LoadHandler.OnLoadStart:"
+                print("[qt.py] LoadHandler.OnLoadStart:"
                       " keyboard focus fix no. 2 (Issue #284)")
                 browser.SetFocus(True)
             self.initial_app_loading = False
@@ -281,7 +281,7 @@ def OnSetFocus(self, **_):
     def OnGotFocus(self, browser, **_):
         # Temporary fix no. 1 for focus issues on Linux (Issue #284)
         if LINUX:
-            print("[qt4.py] FocusHandler.OnGotFocus:"
+            print("[qt.py] FocusHandler.OnGotFocus:"
                   " keyboard focus fix no. 1 (Issue #284)")
             browser.SetFocus(True)
 
diff --git a/tools/run_examples.py b/tools/run_examples.py
@@ -72,19 +72,26 @@ def main():
         print("[run_examples.py] PASS: gtk3.py (Gtk 3 not installed)")
         passed.append("gtk3.py")
 
-    # pyqt
+    # pyqt4
     if packages["PyQt4"]:
-        examples.append("qt4.py pyqt")
+        examples.append("qt.py pyqt4")
     else:
-        print("[run_examples.py] PASS: qt4.py pyqt (PyQt4 not installed)")
-        passed.append("qt4.py pyqt")
+        print("[run_examples.py] PASS: qt.py pyqt4 (PyQt4 not installed)")
+        passed.append("qt.py pyqt4")
+
+    # pyqt5
+    if packages["PyQt5"]:
+        examples.append("qt.py pyqt5")
+    else:
+        print("[run_examples.py] PASS: qt.py pyqt5 (PyQt5 not installed)")
+        passed.append("qt.py pyqt5")
 
     # pyside
     if packages["PySide"]:
-        examples.append("qt4.py pyside")
+        examples.append("qt.py pyside")
     else:
-        print("[run_examples.py] PASS: qt4.py pyside (PySide not installed)")
-        passed.append("qt4.py pyside")
+        print("[run_examples.py] PASS: qt.py pyside (PySide not installed)")
+        passed.append("qt.py pyside")
 
     # tkinter
     if MAC:
@@ -160,6 +167,7 @@ def check_installed_packages():
         "gi": False,
         "kivy": False,
         "PyQt4": False,
+        "PyQt5": False,
         "PySide": False,
         "tkinter": False,
         "Tkinter": False,
