Merge lp:~springermac/openlp/documentation-pyqt5-update into lp:openlp/documentation

[Jonathan Springer]

Updates for PyQt5

[Tim Bentley (trb143)]

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'api/source/conf.py'
--- api/source/conf.py	2015-10-16 20:24:24 +0000
+++ api/source/conf.py	2015-12-25 05:04:02 +0000
@@ -346,11 +346,16 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python': ('http://docs.python.org/3.4', None)}
+intersphinx_mapping = {'python': ('http://docs.python.org/3.5', None),
+                       'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest', None),
+                       'alembic': ('http://alembic.readthedocs.org/en/latest', None),
+                       'chardet': ('http://chardet.readthedocs.org/en/latest', None),
+                       'bs4': ('http://www.crummy.com/software/BeautifulSoup/bs4/doc/', None),
+                       'mako': ('http://docs.makotemplates.org/en/latest/', None),
+                       'psycopg2': ('http://initd.org/psycopg/docs/', None)}
 
 autosummary_generate = True
 
 autodoc_default_flags = ['members', 'undoc-members', 'show-inheritance']
 
-autodoc_mock_imports = ['pyodbc', 'uno', 'PyQt4.phonon', 'com.sun.star.connection', 'com.sun.star.beans',
-                        'PyQt4.QtCore']
+autodoc_mock_imports = ['pyodbc', 'uno', 'com.sun.star.connection', 'com.sun.star.beans', 'PyQt5.QtCore']