Skip to content

Commit 5a3506a

Browse files
committed
Minor documentation updates
1 parent 6b87553 commit 5a3506a

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/PythonQtDoc.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,11 @@ Qt framework</a>.
129129
\section Supported Supported Versions
130130
131131
PythonQt supports:
132-
- Python 2 (>= Python 2.6)
133-
- Python 3 (>= Python 3.3)
134-
- Qt 4.x (Qt 4.7 and Qt 4.8 recommended)
135-
- Qt 5.x (Tested with Qt 5.0, 5.3, 5.4, 5.6 and 5.11)
132+
- Python 2 (>= Python 2.7)
133+
- Python 3 (>= Python 3.6)
134+
- Qt 4.x (Qt 4.7 and Qt 4.8 recommended) (not in the master branch, see below)
135+
- Qt 5.x (Tested with Qt 5.0, 5.3, 5.4, 5.6, 5.11, 5.12 and 5.15)
136+
- Qt 6.x (Tested with Qt 6.5 and 6.6) - support may not be complete, support for optional modules may be added as needed
136137
137138
The last working Qt4 version is available at svn branches/Qt4LastWorkingVersion or you can download the PythonQt 3.0 release.
138139
The current git master branch no longer supports Qt4, since we started to make use of some Qt5-only features.
@@ -196,23 +197,25 @@ Qt framework</a>.
196197
<tr><td>char/uchar,int/uint,short,ushort,QChar</td><td>integer</td></tr>
197198
<tr><td>long</td><td>integer</td></tr>
198199
<tr><td>ulong,longlong,ulonglong</td><td>long</td></tr>
199-
<tr><td>QString</td><td>unicode string</td></tr>
200-
<tr><td>QByteArray</td><td>QByteArray wrapper <sup>\ref qbytearray-bytes "(1)"</sup></td></tr>
200+
<tr><td>QString <sup>\ref qstring "(1)"</sup></td><td>unicode string</td></tr>
201+
<tr><td>QByteArray <sup>\ref qbytearray "(2)"</sup></td><td>QByteArray wrapper <sup>\ref qbytearray-bytes "(3)"</sup></td></tr>
201202
<tr><td>char*</td><td>str</td></tr>
202203
<tr><td>QStringList</td><td>tuple of unicode strings</td></tr>
203204
<tr><td>QVariantList</td><td>tuple of objects</td></tr>
204205
<tr><td>QVariantMap</td><td>dict of objects</td></tr>
205-
<tr><td>QVariant</td><td>depends on type <sup>\ref qvariant "(2)"</sup></td></tr>
206+
<tr><td>QVariant</td><td>depends on type <sup>\ref qvariant "(4)"</sup></td></tr>
206207
<tr><td>QSize, QRect and all other standard Qt QVariants</td><td>variant wrapper that supports complete API of the respective Qt classes</td></tr>
207208
<tr><td>OwnRegisteredMetaType</td><td>C++ wrapper, optionally with additional information/wrapping provided by registerCPPClass()</td></tr>
208209
<tr><td>QList<AnyObject*></td><td>converts to a list of CPP wrappers</td></tr>
209210
<tr><td>QVector<AnyObject*></td><td>converts to a list of CPP wrappers</td></tr>
210211
<tr><td>EnumType</td><td>Enum wrapper derived from python integer</td></tr>
211212
<tr><td>QObject (and derived classes)</td><td>QObject wrapper</td></tr>
212213
<tr><td>C++ object</td><td>CPP wrapper, either wrapped via PythonQtCppWrapperFactory or just decorated with decorators</td></tr>
213-
<tr><td>PyObject</td><td>PyObject <sup>\ref pyobject "(3)"</sup></td></tr>
214+
<tr><td>PyObject</td><td>PyObject <sup>\ref pyobject "(5)"</sup></td></tr>
214215
</table>
215216
217+
-# \anchor qstring QStringRef (Qt5), QStringView and QAnyStringView (Qt6) are handled like QString.
218+
-# \anchor qbytearray QByteArrayView (Qt6) is handled like QByteArray.
216219
-# \anchor qbytearray-bytes The Python 'bytes' type will automatically be converted to QByteArray where required. For converting a QByteArray to 'bytes' use the .data() method.
217220
-# \anchor qvariant QVariants are mapped recursively as given above, e.g. a dictionary can
218221
contain lists of dictionaries of doubles.

0 commit comments

Comments
 (0)