projects
/
gc-dialer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
94a65b5
)
Temporarilly disabling pyside
author
Ed Page
<eopage@byu.net>
Thu, 21 Apr 2011 01:56:05 +0000
(20:56 -0500)
committer
Ed Page
<eopage@byu.net>
Thu, 21 Apr 2011 01:56:05 +0000
(20:56 -0500)
src/util/qt_compat.py
patch
|
blob
|
history
support/builddeb.py
patch
|
blob
|
history
diff --git
a/src/util/qt_compat.py
b/src/util/qt_compat.py
index
3ab17c8
..
2ab7fa4
100644
(file)
--- 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
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)
import sip
sip.setapi('QString', 2)
sip.setapi('QVariant', 2)
diff --git
a/support/builddeb.py
b/support/builddeb.py
index
94fedb2
..
c3f93ae
100755
(executable)
--- 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",
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([
])
}[distribution]
p.recommends = ", ".join([
])