auto/moc test fails - semicolons after macro

the auto/moc test fails with the below error
the attached patch fixes the issue

cd moc/ && /usr/bin/gmake -f Makefile.host
gmake[3]: Entering directory `/export/home/test/tmp/qt/tests/auto/moc'
/usr/bin/CC -c -features=extensions -library=no%Cstd -library=Crun -lstdcxx4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/stdcxx4/ -I/usr/include/stdcxx4/ansi -I/opt/kde4/include -O2 -mt -DSRCDIR=\"/export/home/test/tmp/qt/tests/auto/moc\" -DWITH_DBUS -DQT_NO_DEBUG -DQT_DBUS_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -I/usr/local/Trolltech/Qt-4.7.0/mkspecs/solaris-cc -I. -I../../../include/QtCore -I../../../include/QtNetwork -I../../../include/QtGui -I../../../include/QtSql -I../../../include/Qt3Support -I../../../include/QtSvg -I../../../include/QtScript -I../../../include/QtDBus -I../../../include -I../../../include/QtTest -Itestproject/include -Itestproject -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/tst_moc.o tst_moc.cpp
"../../../include/Qt3Support/../../src/qt3support/widgets/q3datetimeedit.h", line 109: Warning: d hides Q3DateEdit::d.
"../../../include/Qt3Support/../../src/qt3support/widgets/q3datetimeedit.h", line 111: Warning: d hides Q3DateEdit::d.
"../../../include/Qt3Support/../../src/qt3support/widgets/q3datetimeedit.h", line 190: Warning: d hides Q3TimeEdit::d.
"../../../include/Qt3Support/../../src/qt3support/widgets/q3datetimeedit.h", line 192: Warning: d hides Q3TimeEdit::d.
"../../../include/Qt3Support/../../src/qt3support/sql/q3datatable.h", line 243: Warning: Q3DataTable::paintCell hides the virtual function Q3Table::paintCell(QPainter*, int, int, const QRect&, bool).
"../../../include/Qt3Support/../../src/qt3support/sql/q3sqlfieldinfo.h", line 152: Warning: trim hides Q3SqlFieldInfo::trim.
"../../../include/Qt3Support/../../src/qt3support/sql/q3sqlselectcursor.h", line 107: Warning: Q3SqlSelectCursor::del hides the virtual function Q3SqlCursor::del(const QString&, bool).
"../../../include/Qt3Support/../../src/qt3support/sql/q3sqlselectcursor.h", line 107: Warning: Q3SqlSelectCursor::toString hides the virtual function Q3SqlCursor::toString(const QSqlIndex&, QSqlRecord*, const QString&, const QString&, const QString&) const.
"../../../include/Qt3Support/../../src/qt3support/sql/q3sqlselectcursor.h", line 107: Warning: Q3SqlSelectCursor::toString hides the virtual function Q3SqlCursor::toString(QSqlRecord*, const QString&, const QString&, const QString&) const.
"../../../include/Qt3Support/../../src/qt3support/sql/q3sqlselectcursor.h", line 107: Warning: Q3SqlSelectCursor::toString hides the virtual function Q3SqlCursor::toString(const QString&, QSqlField*, const QString&) const.
"../../../include/Qt3Support/../../src/qt3support/itemviews/q3iconview.h", line 511: Warning: Q3IconView::drawContents hides the virtual function Q3ScrollView::drawContents(QPainter*).
"../../../include/Qt3Support/../../src/qt3support/text/q3multilineedit.h", line 135: Warning: Q3MultiLineEdit::setAlignment hides the virtual function Q3TextEdit::setAlignment(int).
"tst_moc.cpp", line 1079: Error: "}" expected instead of ";".
"tst_moc.cpp", line 1097: Error: A declaration was expected instead of "public".
"tst_moc.cpp", line 1098: Error: There must be an identifier to declare.
"tst_moc.cpp", line 1100: Error: mFoo is not defined.
"tst_moc.cpp", line 1101: Error: Cannot return PrivatePropertyTest from a function that should return MyDPointer*.
"tst_moc.cpp", line 1102: Error: A declaration was expected instead of "private".
"tst_moc.cpp", line 1104: Error: Multiple declaration for d.
"tst_moc.cpp", line 1105: Error: A declaration was expected instead of "}".
".moc/release-shared/tst_moc.moc", line 1155: Error: The function "foo" must have a prototype.
".moc/release-shared/tst_moc.moc", line 1156: Error: Pointer type needed instead of PrivatePropertyTest.
".moc/release-shared/tst_moc.moc", line 1157: Error: d is not a member of PrivatePropertyTest.
".moc/release-shared/tst_moc.moc", line 1158: Error: QObject::d_func() is not accessible from PrivatePropertyTest::qt_metacall(QMetaObject::Call, int, void**).
".moc/release-shared/tst_moc.moc", line 1158: Error: QObject::d_func() is not accessible from PrivatePropertyTest::qt_metacall(QMetaObject::Call, int, void**).
".moc/release-shared/tst_moc.moc", line 1158: Error: The type "QObjectPrivate" is incomplete.
".moc/release-shared/tst_moc.moc", line 1165: Error: Pointer type needed instead of PrivatePropertyTest.
".moc/release-shared/tst_moc.moc", line 1166: Error: d is not a member of PrivatePropertyTest.
".moc/release-shared/tst_moc.moc", line 1167: Error: QObject::d_func() is not accessible from PrivatePropertyTest::qt_metacall(QMetaObject::Call, int, void**).
".moc/release-shared/tst_moc.moc", line 1167: Error: QObject::d_func() is not accessible from PrivatePropertyTest::qt_metacall(QMetaObject::Call, int, void**).
".moc/release-shared/tst_moc.moc", line 1167: Error: The type "QObjectPrivate" is incomplete.
19 Error(s) and 12 Warning(s) detected.
gmake[3]: *** [.obj/release-shared/tst_moc.o] Error 19
gmake[3]: Leaving directory `/export/home/test/tmp/qt/tests/auto/moc'
gmake[2]: *** [sub-moc-make_default] Error 2
gmake[2]: Leaving directory `/export/home/test/tmp/qt/tests/auto'
gmake[1]: *** [sub-host-pro-make_default] Error 2
gmake[1]: Leaving directory `/export/home/test/tmp/qt/tests/auto'
gmake: *** [sub-auto-make_default] Error 2