MNT : Merge branch 'v1.4.x' back into master

Author: tacaswell

MANIFEST.in

@@ -1,5 +1,5 @@
 include CHANGELOG INSTALL
-include TODO CONTRIBUTING.md
+include CONTRIBUTING.md
 include Makefile MANIFEST.in
 include matplotlibrc.template setup.cfg.template
 include setupext.py setup.py distribute_setup.py

Makefile

@@ -3,7 +3,7 @@
 PYTHON = `which python`
 VERSION = `${PYTHON} setup.py --version`
 
-DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README TODO license	\
+DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README license	\
 	CHANGELOG Makefile INTERACTIVE			\
 	MANIFEST.in lib lib/matplotlib lib/dateutil lib/pytz examples setup.py
 
@@ -49,6 +49,6 @@ test:
 
 
 test-coverage:
-	${PYTHON} tests.py --with-coverage --cover-package=matplotlib	
+	${PYTHON} tests.py --with-coverage --cover-package=matplotlib
 
 

lib/matplotlib/backends/backend_qt5.py

@@ -125,13 +125,13 @@ def _create_qApp():
     """
     Only one qApp can exist at a time, so check before creating one.
     """
-    if QtWidgets.QApplication.startingUp():
+    global qApp
+
+    if qApp is None:
         if DEBUG:
             print("Starting up QApplication")
-        global qApp
         app = QtWidgets.QApplication.instance()
         if app is None:
-
             # check for DISPLAY env variable on X11 build of Qt
             if hasattr(QtGui, "QX11Info"):
                 display = os.environ.get('DISPLAY')