Commit fbc0a781 authored by Claes Sjofors's avatar Claes Sjofors Committed by Claes Sjöfors

pwrwb build fix for Qt and some doc fixes

parent c7a336ef
......@@ -85,7 +85,7 @@ while (v):\n\
");
PyDoc_STRVAR(vid_root_doc,"\
child()\n--\n\n\
root()\n--\n\n\
Get first root object of the volume.\n\n\
Returns\n\
-------\n\
......@@ -100,7 +100,7 @@ while o:\n\
");
PyDoc_STRVAR(vid_roots_doc,"\
children()\n--\n\n\
roots()\n--\n\n\
Get all root objects of the volume.\n\n\
Returns\n\
-------\n\
......@@ -651,7 +651,7 @@ pwrwb.openWb('VolDemo')\n\
PyDoc_STRVAR(pwrwb_openSession_doc,"\
openSession(volume, access)\n--\n\n\
Open database.\n\
Open session.\n\
If no database argument is supplied, the directory volume is opened.\n\n\
Arguments\n\
---------\n\
......@@ -1052,7 +1052,7 @@ static PyTypeObject ArefType = {
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"Proview runtime object", /* tp_doc */
"Proview development attribute", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
Aref_richcompare, /* tp_richcompare */
......@@ -1126,7 +1126,7 @@ static PyTypeObject CidType = {
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"Proview runtime class", /* tp_doc */
"Class of a development object", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
Cid_richcompare, /* tp_richcompare */
......@@ -1187,7 +1187,7 @@ static PyTypeObject TidType = {
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"Proview runtime class", /* tp_doc */
"Attribute type", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
Tid_richcompare, /* tp_richcompare */
......
......@@ -19,6 +19,7 @@ if pwre_conf_qt == "":
'pwr_wb', 'pwr_xtt', 'pwr_ge', 'pwr_cow',
'pwr_flow', 'pwr_glow',
'pwr_rt', 'pwr_statussrv', 'pwr_co', 'pwr_msg_dummy']
xlibs = ['gtk-x11-2.0']
else:
libs = ['pwr_wb_qt', 'pwr_xtt_qt', 'pwr_ge_qt', 'pwr_cow_qt',
'pwr_flow_qt', 'pwr_glow_qt',
......@@ -27,6 +28,7 @@ else:
'pwr_wb', 'pwr_xtt', 'pwr_ge', 'pwr_cow',
'pwr_flow', 'pwr_glow',
'pwr_rt', 'pwr_statussrv', 'pwr_co', 'pwr_msg_dummy']
xlibs = ['QtCore', 'QtGui']
pwrwbmodule = Extension( name='pwrwb',
sources=['pwrwbmodule.cpp'],
......@@ -45,7 +47,7 @@ pwrwbmodule = Extension( name='pwrwb',
libraries=libs +
['db_cxx', 'rpcsvc', 'asound', 'pthread',
'm', 'db', 'z', 'crypt', 'rt', 'fl', 'X11', 'mysqlclient',
'sqlite3', 'rsvg-2','gtk-x11-2.0'],
'sqlite3', 'rsvg-2', 'QtCore', 'QtGui'] + xlibs,
# extra_link_args=['-L/usr/lib/x86_64-linux-gnu', commands.getoutput('pkg-config --libs gtk+-2.0')],
language='c++'
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment