jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed code for setting QtCore.__version_info__ to not use Shiboken::makeTuple.

Browse source
This commit is contained in:
Marcelo Lira 2011-11-30 16:02:59 -03:00 • committed by Hugo Parente Lima
commit 30118e265d
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PySide/QtCore/glue/qt_version.cpp
View file

@ -1,5 +0,0 @@
QList<QByteArray> version = QByteArray(qVersion()).split('.');
PyObject *pyQtVersion = Shiboken::makeTuple(version[0].toInt(), version[1].toInt(), version[2].toInt());
PyModule_AddStringConstant(module, "__version__", qVersion());
PyModule_AddObject(module, "__version_info__", pyQtVersion);

10
PySide/QtCore/typesystem_core.xml
View file

@ -891,7 +891,15 @@
qAddPostRoutine(PySide::globalPostRoutineCallback); qAddPostRoutine(PySide::globalPostRoutineCallback);
</inject-code> </inject-code>
<inject-code class="target" position="end" file="glue/qt_version.cpp" /> <inject-code class="target" position="end">
QList&lt;QByteArray&gt; version = QByteArray(qVersion()).split('.');
PyObject* pyQtVersion = PyTuple_New(3);
for (int i = 0; i &lt; 3; ++i)
PyTuple_SET_ITEM(pyQtVersion, i, PyInt_FromLong(version[i].toInt()));
PyModule_AddObject(module, "__version_info__", pyQtVersion);
PyModule_AddStringConstant(module, "__version__", qVersion());
</inject-code>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
{ // Avoid name clash { // Avoid name clash
Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit")); Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit"));