From: Ed Page Date: Thu, 21 Apr 2011 01:56:05 +0000 (-0500) Subject: Temporarilly disabling pyside X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=ae7ca7c5ac54e19e3f40aa7ed4a8769a14023343 Temporarilly disabling pyside --- diff --git a/src/util/qt_compat.py b/src/util/qt_compat.py index 3ab17c8..2ab7fa4 100644 --- a/src/util/qt_compat.py +++ b/src/util/qt_compat.py @@ -3,11 +3,12 @@ from __future__ import with_statement from __future__ import division -try: - import PySide.QtCore as _QtCore - QtCore = _QtCore - USES_PYSIDE = True -except ImportError: +#try: +# import PySide.QtCore as _QtCore +# QtCore = _QtCore +# USES_PYSIDE = True +#except ImportError: +if True: import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) diff --git a/support/builddeb.py b/support/builddeb.py index 94fedb2..c3f93ae 100755 --- a/support/builddeb.py +++ b/support/builddeb.py @@ -91,7 +91,8 @@ def build_package(distribution): p.depends += { "debian": ", python-qt4", "diablo": ", python2.5-qt4-core, python2.5-qt4-gui", - "fremantle": ", python-pyside.qtgui, python-pyside.qtcore, python-pyside.qtmaemo5, python-qtmobility.contacts", + "fremantle": ", python2.5-qt4-core, python2.5-qt4-gui, python2.5-qt4-maemo5", + #"fremantle": ", python-pyside.qtgui, python-pyside.qtcore, python-pyside.qtmaemo5, python-qtmobility.contacts", }[distribution] p.recommends = ", ".join([ ])