Skip to content

Remove dependence on modules: QtWidgets, QtGui #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Remove dependence on modules: QtWidgets, QtGui #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5897f1f
Update coverage test to QCoreApplication
zhang-peter Dec 26, 2017
eb5ebdd
Remove dependence on modules: QtWidgets, QtGui
zhang-peter Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@

@fixture(scope='session')
def application():
from quamash import QApplication
return QApplication([])
from quamash import QCoreApplication
return QCoreApplication([])
12 changes: 3 additions & 9 deletions quamash/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@
logger.info('Using Qt Implementation: {}'.format(QtModuleName))

QtCore = __import__(QtModuleName + '.QtCore', fromlist=(QtModuleName,))
QtGui = __import__(QtModuleName + '.QtGui', fromlist=(QtModuleName,))
if QtModuleName == 'PyQt5':
from PyQt5 import QtWidgets
QApplication = QtWidgets.QApplication
else:
QApplication = QtGui.QApplication

QCoreApplication = QtCore.QCoreApplication

from ._common import with_logger

Expand Down Expand Up @@ -237,8 +231,8 @@ class _QEventLoop:
"""

def __init__(self, app=None):
self.__app = app or QApplication.instance()
assert self.__app is not None, 'No QApplication has been instantiated'
self.__app = app or QCoreApplication.instance()
assert self.__app is not None, 'No QCoreApplication has been instantiated'
self.__is_running = False
self.__debug_enabled = False
self.__default_executor = None
Expand Down