Merge branch 'fix_tests' into 'master'

Fix tests (broken on newer versions of pytest-qt)

See merge request openlp/openlp!332

tests/conftest.py

@@ -43,7 +43,12 @@ from openlp.core.common.settings import Settings
 @pytest.fixture
 def qapp(qtbot):
     """An instance of QApplication"""
-    qt_api.QApplication.instance()
+    # Newer versions of pytest-qt have QApplication in the widgets module.
+    # Catch attribute error if the widgets module is missing and instantiate QApplication the old way.
+    try:
+        qt_api.QtWidgets.QApplication.instance()
+    except AttributeError:
+        qt_api.QApplication.instance()
     app = OpenLP()
     yield app
     del app