From 8e2fa9d7ef64a966e3d42df5b6b458b3f2ba34fb Mon Sep 17 00:00:00 2001 From: Jonathan Springer Date: Wed, 23 Dec 2015 12:14:43 -0500 Subject: [PATCH] Changes for Qt5 --- osx/Info.plist | 2 - osx/macosx-builder.py | 5 +-- .../hook-openlp.core.ui.media.py | 2 +- pyinstaller-hooks/rthook_openlp_pyqt4.py | 43 ------------------- windows/windows-builder.py | 5 +-- 5 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 pyinstaller-hooks/rthook_openlp_pyqt4.py diff --git a/osx/Info.plist b/osx/Info.plist index b83db22..cfc1a38 100755 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -116,8 +116,6 @@ CFBundlePackageType APPL - LSBackgroundOnly - NSHighResolutionCapable CFBundleHelpBookFolder diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py index 77ac71a..60e6d1e 100644 --- a/osx/macosx-builder.py +++ b/osx/macosx-builder.py @@ -329,7 +329,6 @@ class MacosxBuilder(object): '--windowed', '--noupx', '--additional-hooks-dir', self.hooks_path, - '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'), '--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'), '-i', self.mac_icon, '-p', self.work_path, @@ -341,11 +340,9 @@ class MacosxBuilder(object): cmd.append('--log-level=DEBUG') if self.args.devel: cmd.append('-d') - pyinstaller = Popen(cmd, stdout=PIPE) - output = pyinstaller.communicate()[0] + pyinstaller = Popen(cmd) code = pyinstaller.wait() if code != 0: - self._print(output) raise Exception('Error running PyInstaller') def write_version_file(self): diff --git a/pyinstaller-hooks/hook-openlp.core.ui.media.py b/pyinstaller-hooks/hook-openlp.core.ui.media.py index c4af859..bcc5092 100644 --- a/pyinstaller-hooks/hook-openlp.core.ui.media.py +++ b/pyinstaller-hooks/hook-openlp.core.ui.media.py @@ -20,6 +20,6 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -hiddenimports = ['openlp.core.ui.media.phononplayer', +hiddenimports = ['openlp.core.ui.media.systemplayer', 'openlp.core.ui.media.vlcplayer', 'openlp.core.ui.media.webkitplayer'] diff --git a/pyinstaller-hooks/rthook_openlp_pyqt4.py b/pyinstaller-hooks/rthook_openlp_pyqt4.py deleted file mode 100644 index 1142f28..0000000 --- a/pyinstaller-hooks/rthook_openlp_pyqt4.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2015 OpenLP Developers # -# --------------------------------------------------------------------------- # -# This program is free software; you can redistribute it and/or modify it # -# under the terms of the GNU General Public License as published by the Free # -# Software Foundation; version 2 of the License. # -# # -# This program is distributed in the hope that it will be useful, but WITHOUT # -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # -# more details. # -# # -# You should have received a copy of the GNU General Public License along # -# with this program; if not, write to the Free Software Foundation, Inc., 59 # -# Temple Place, Suite 330, Boston, MA 02111-1307 USA # -############################################################################### - - -# PyQt4 supports two different APIs: version 1 (default on Python 2) and -# version 2 (default on Python 3). For OpenLP we want to use the version 2 API -# with Python 2. -# -# The v2 API has to be set before any import of PyQt4 modules. -# However, the executable created by PyInstaller overrides qt_plugins directory -# (it uses PyQt4) before any code from OpenLP gets executed. -# -# The following code is bundled with the created executable and executed -# before any other code. - -import sip - -sip.setapi('QDate', 2) -sip.setapi('QDateTime', 2) -sip.setapi('QString', 2) -sip.setapi('QTextStream', 2) -sip.setapi('QTime', 2) -sip.setapi('QUrl', 2) -sip.setapi('QVariant', 2) diff --git a/windows/windows-builder.py b/windows/windows-builder.py index 2217f75..010e584 100644 --- a/windows/windows-builder.py +++ b/windows/windows-builder.py @@ -296,7 +296,6 @@ class WindowsBuilder(object): '--windowed', '--noupx', '--additional-hooks-dir', self.hooks_path, - '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'), '--distpath', self.dist_path_pyinst_arg, '-i', self.win32_icon, '-p', self.branch_path, @@ -306,11 +305,9 @@ class WindowsBuilder(object): cmd.append('--log-level=ERROR') else: cmd.append('--log-level=DEBUG') - pyinstaller = Popen(cmd, stdout=PIPE) - output = pyinstaller.communicate()[0] + pyinstaller = Popen(cmd) code = pyinstaller.wait() if code != 0: - self._print(output) raise Exception('Error running PyInstaller') def write_version_file(self):