Mercurial > projects > qtd
changeset 279:519befd5a5d1
Fix for windows build, thanks Rainer.
Fix for signals.
author | eldar |
---|---|
date | Fri, 09 Oct 2009 06:17:51 +0000 |
parents | 5df570e79cfc |
children | bcc498ccf334 |
files | generator/dgenerator.cpp qt/d1/qt/Signal.d qt/d2/qt/Signal.d |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/dgenerator.cpp Sun Oct 04 12:14:03 2009 +0000 +++ b/generator/dgenerator.cpp Fri Oct 09 06:17:51 2009 +0000 @@ -2565,7 +2565,7 @@ // write static constructor if (staticInit) { QString initArgs; - if (cpp_shared) + if (cpp_shared && d_class->generateShellClass()) { initArgs = "void* virtuals"; if (d_class->isQObject()) @@ -2582,7 +2582,7 @@ << INDENT << " " << d_class->name() << ".createStaticMetaObject;" << endl << endl; } - if (cpp_shared) { + if (cpp_shared && d_class->generateShellClass()) { // virtual functions s << INDENT << "void*[" << virtualFunctions.size() << "] virt_arr;" << endl; for (int pos = 0; pos<virtualFunctions.size(); ++pos) {
--- a/qt/d1/qt/Signal.d Sun Oct 04 12:14:03 2009 +0000 +++ b/qt/d1/qt/Signal.d Fri Oct 09 06:17:51 2009 +0000 @@ -1066,7 +1066,7 @@ mixin SignalHandlerOps; } mixin("private static const int __sig" ~ ToString!(index) ~ " = " ~ ToString!(index) ~ ";"); - mixin("public alias Tuple!(\"" ~ signatureString!(name, A) ~ "\", index, TupleWrapper!(A)) __signal" ~ ToString!(index) ~ ";"); +// mixin("public alias Tuple!(\"" ~ signatureString!(name, A) ~ "\", index, TupleWrapper!(A)) __signal" ~ ToString!(index) ~ ";"); mixin("SignalOps!(" ~ ToString!(index) ~ ", A) " ~ name ~ "(){ return SignalOps!(" ~ ToString!(index) ~ ", A)(signalHandler); }"); }
--- a/qt/d2/qt/Signal.d Sun Oct 04 12:14:03 2009 +0000 +++ b/qt/d2/qt/Signal.d Fri Oct 09 06:17:51 2009 +0000 @@ -1032,7 +1032,7 @@ mixin SignalHandlerOps; } /* deprecated */ mixin("private static const int __sig" ~ ToString!(index) ~ " = " ~ ToString!(index) ~ ";"); - mixin("public alias TypeTuple!(\"" ~ signatureString!(name, A) ~ "\", index, TupleWrapper!(A)) __signal" ~ ToString!(index) ~ ";"); + // mixin("public alias TypeTuple!(\"" ~ signatureString!(name, A) ~ "\", index, TupleWrapper!(A)) __signal" ~ ToString!(index) ~ ";"); mixin("SignalOps!(" ~ ToString!(index) ~ ", A) " ~ name ~ "(){ return SignalOps!(" ~ ToString!(index) ~ ", A)(signalHandler); }"); }