Mercurial > projects > qtd
diff generator/typesystem_core.xml @ 309:8a0cf14e3419 signals
wrong merge
author | eldar_ins@eldar-laptop |
---|---|
date | Wed, 23 Dec 2009 04:48:11 +0500 |
parents | 2485419c5c63 |
children | 7a3c43424dca |
line wrap: on
line diff
--- a/generator/typesystem_core.xml Wed Dec 23 04:45:55 2009 +0500 +++ b/generator/typesystem_core.xml Wed Dec 23 04:48:11 2009 +0500 @@ -2290,7 +2290,7 @@ <reference-count action="set" variable-name="__rcStandardOutputProcess"/> </modify-argument> </modify-function> -<!-- <modify-function signature="startDetached(QString,QStringList<QString>,QString,long long*)"> +<!-- <modify-function signature="startDetached(QString,QStringList,QString,long long*)"> <access modifier="private"/> <modify-argument index="4"> <remove-default-expression/>