Commit graph

108 commits

Author SHA1 Message Date
Ivailo Monev
df31068ba9 remove QMetaObjectExtraData and put everything into QMetaObject
upstream commits:
67f58040ea

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 19:55:15 +02:00
Ivailo Monev
b183f81775 regenerate xml and script parsers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-18 18:47:34 +02:00
Ivailo Monev
1ac7f59fc2 fix build of script component for windows
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-15 21:40:34 +02:00
Ivailo Monev
950cd439bb get rid of the variantFromValue function in qscriptqobject
upstream commits:
0460d63ed03f0de574a06268df2a267d44784cb0 (partitially)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-13 23:37:49 +02:00
Ivailo Monev
f39a06e2e6 no need to asign ref now
upstream commits:
65a4bdd109d924f802379a67b8bf23f9cefc8a54

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-13 14:50:49 +02:00
Ivailo Monev
3c00934966 improve handling of QScriptEngine::ExcludeDeleteLater
upstream commits:
58dc831e557eb533bf40c9ff7b79d01d58b6de98
0ff8577a992b1d5c011b04e47ade84074cbd3034

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-13 14:49:29 +02:00
Ivailo Monev
49c09b6593 Replace all QBasicAtomicInt ref variables by QSharedData inheritance
upstream commit 9a85b921ac457c68cee0c89b8ad11433b1e92d07

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-13 14:30:52 +02:00
Ivailo Monev
bfbc380756 initial import
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-10 05:06:13 +02:00