GIT_REPOSITORIES/LPP/PythonQt Commit - r193:65af4461ce48

adapted to new generator files...

florianlink -

r193:65af4461ce48

parent child

Context file:

r193:65af4461ce48

Collapse all files

src/PythonQt.cpp +13 -1

@@ -1216,7 +1216,7 void PythonQtPrivate::addDecorators(QObject* o, int decoTypes)
1216	} else if (qstrncmp(m.signature(), "static_", 7)==0) {	1216	} else if (qstrncmp(m.signature(), "static_", 7)==0) {
1217	if ((decoTypes & StaticDecorator) == 0) continue;	1217	if ((decoTypes & StaticDecorator) == 0) continue;
1218	QByteArray signature = m.signature();	1218	QByteArray signature = m.signature();
1219	QByteArray nameOfClass = signature.mid(~~signature~~.~~indexOf~~(~~'_'~~)+1);	1219	QByteArray nameOfClass = signature.mid(7);
1220	nameOfClass = nameOfClass.mid(0, nameOfClass.indexOf('_'));	1220	nameOfClass = nameOfClass.mid(0, nameOfClass.indexOf('_'));
1221	PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);	1221	PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);
1222	PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::ClassDecorator);	1222	PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::ClassDecorator);
@@ -1779,3 +1779,15 void PythonQtPrivate::shellClassDeleted( void* shellClass )
1779	// it will be handled by the QPointer<> to the QObject, which becomes NULL	1779	// it will be handled by the QPointer<> to the QObject, which becomes NULL
1780	// via the QObject destructor.	1780	// via the QObject destructor.
1781	}	1781	}
		1782
		1783	PyObject* PythonQtPrivate::wrapMemoryAsBuffer( const void* data, Py_ssize_t size )
		1784	{
		1785	// P3K port needed later on!
		1786	return PyBuffer_FromMemory((void*)data, size);
		1787	}
		1788
		1789	PyObject* PythonQtPrivate::wrapMemoryAsBuffer( void* data, Py_ssize_t size )
		1790	{
		1791	// P3K port needed later on!
		1792	return PyBuffer_FromReadWriteMemory(data, size);
		1793	} No newline at end of file

src/PythonQt.h +6 0

               //! wrap the given ptr into a Python object (or return existing wrapper!) if there is a known QObject of that name or a known wrapper in the factory
               PyObject* wrapPtr(void* ptr, const QByteArray& name);
+              //! create a read-only buffer object from the given memory
+              static PyObject* wrapMemoryAsBuffer(const void* data, Py_ssize_t size);
+              //! create a read-write buffer object from the given memory
+              static PyObject* wrapMemoryAsBuffer(void* data, Py_ssize_t size);
               //! registers a QObject derived class to PythonQt (this is implicitly called by addObject as well)
               /* Since Qt4 does not offer a way to detect if a given classname is derived from QObject and thus has a QMetaObject,
                  you MUST register all your QObject derived classes here when you want them to be detected in signal and slot calls */

src/PythonQtDoc.h +4 -7

              The PythonQt wrappers generated by the generator located in the "generated_cpp" directory are free to be used without any licensing restrictions.
-             The generated wrappers are pre-generated and checked-in for Qt 4.8, so you only need to build and run the
+             The generated wrappers are pre-generated and checked-in for Qt 4.6.1, so you only need to build and run the
              generator when you want to build additional wrappers or you want to upgrade/downgrade to another Qt version.
              You may use the generator to generate C++ bindings for your own C++ classes (e.g., to make them inheritable in Python),
              but this is currently not documented and involves creating your own typesystem files (although the Qt Jambi examples might help you).
              The build scripts a currently set to use Python 2.6.
              You may need to tweak the \b build/python.prf file to set the correct Python includes and libs on your system.
-             \note In addition to the qmake profiles, PythonQt now offers building via Cmake. Just use the provided
+             \subsection Windows
-             CMakeLists.txt in the root directory of the project. This build option has not been well tested yet.
-             \section Windows
              On Windows, the (non-source) Python Windows installer can be used.
              Make sure that you use the same compiler, the current Python distribution is built
              The tests and examples are located in PythonQt/lib.
-             \section Linux
+             \subsection Linux
              On Linux, you need to install a Python-dev package.
              If Python can not be linked or include files can not be found,
              You should add PythonQt/lib to your LD_LIBRARY_PATH so that the runtime
              linker can find the *.so files.
-             \section MacOSX
+             \subsection MacOsX
              On Mac, Python is installed as a Framework, so you should not need to install it.
              To build PythonQt, just do a:

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages