Skip to content

Commit bede258

Browse files
committed
enable QThread (it was removed long time ago but makes sense now that PythonQt support multi-threading)
removed template function on QQmlEngine
1 parent 7cdf7c2 commit bede258

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

generator/typesystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ TypeDatabase::TypeDatabase() : m_suppressWarnings(true)
14651465
addType(wrapper);
14661466
}
14671467

1468-
addType(new ThreadTypeEntry());
1468+
//addType(new ThreadTypeEntry());
14691469
addType(new VoidTypeEntry());
14701470

14711471
// Predefined containers...

generator/typesystem_core.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,6 +1724,7 @@
17241724
</object-type>
17251725
<object-type name="QFutureSynchronizer" generate="no"/>
17261726
<object-type name="QThreadPool"/>
1727+
<object-type name="QThread"/>
17271728

17281729
<object-type name="QFutureIterator" generate="no">
17291730
<modify-function signature="operator=(const QFuture&amp;)" remove="all"/>

generator/typesystem_qml.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0"?>
22
<typesystem package="com.trolltech.qt.qml">
33

4+
<rejection class="QQmlEngine" function-name="singletonInstance&lt;QJSValue&gt;"/>
5+
46
<rejection class="QQmlListProperty"/>
57
<rejection class="QQmlTypeInfo"/>
68
<rejection class="QQmlImageProviderBase"/>

0 commit comments

Comments
 (0)