Mercurial > projects > qtd
diff generator/typesystem_core-java.java @ 336:b0a7819153bb
fixed signal branch merge problems
author | maxter@maxter |
---|---|
date | Thu, 11 Feb 2010 12:59:25 +0200 |
parents | 24ebea513d66 |
children | 5896535a03cd |
line wrap: on
line diff
--- a/generator/typesystem_core-java.java Sun Feb 07 16:04:36 2010 +0000 +++ b/generator/typesystem_core-java.java Thu Feb 11 12:59:25 2010 +0200 @@ -155,9 +155,9 @@ return result; } - static void connect(QObject sender, string signal, QObject receiver, string method, int type = 0) + static void connect(QObject sender, string signal, QObject receiver, string method) { - QMetaObject.connectImpl(sender, signal, receiver, method, type); + QMetaObject.connectImpl(sender, signal, receiver, method); } }// class