auto/declarative test fails to build

the auto/declarative test fails to build with the below error
this is in current git

the attached patch fixes it for me

test@qttest:~/tmp/qt/tests/auto/declarative$ /usr/bin/gmake -f Makefile.declarative
cd qdeclarativemetatype/ && /usr/bin/gmake -f Makefile.declarative
gmake[1]: Entering directory `/export/home/test/tmp/qt/tests/auto/declarative/qdeclarativemetatype'
/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/declarative/qdeclarativemetatype\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_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/QtGui -I../../../../include/QtDeclarative -I../../../../include -I../../../../include/QtTest -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/tst_qdeclarativemetatype.o tst_qdeclarativemetatype.cpp
"tst_qdeclarativemetatype.cpp", line 316: Error: Could not find a match for QTest::qCompare<QTest::T>(QDeclarativeParserStatus*, ParserStatusTestType*, const char[7], const char[3], const char[29], int) needed in tst_qdeclarativemetatype::qmlParserStatusCast().
"tst_qdeclarativemetatype.cpp", line 336: Error: Could not find a match for QTest::qCompare<QTest::T>(QDeclarativePropertyValueSource*, ValueSourceTestType*, const char[7], const char[3], const char[29], int) needed in tst_qdeclarativemetatype::qmlPropertyValueSourceCast().
"tst_qdeclarativemetatype.cpp", line 356: Error: Could not find a match for QTest::qCompare<QTest::T>(QDeclarativePropertyValueInterceptor*, ValueInterceptorTestType*, const char[12], const char[3], const char[29], int) needed in tst_qdeclarativemetatype::qmlPropertyValueInterceptorCast().
3 Error(s) detected.
gmake[1]: *** [.obj/release-shared/tst_qdeclarativemetatype.o] Error 3
gmake[1]: Leaving directory `/export/home/test/tmp/qt/tests/auto/declarative/qdeclarativemetatype'
gmake: *** [sub-qdeclarativemetatype-make_default] Error 2

with the patch, another error is discovered:

/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/declarative/qdeclarativeecmascript\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_SCRIPT_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/QtScript -I../../../../include/QtDeclarative -I../../../../include -I../../../../include/QtTest -I../shared -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/tst_qdeclarativeecmascript.o tst_qdeclarativeecmascript.cpp
"../../../../include/QtDeclarative/private/../../../src/declarative/qml/qdeclarativeengine_p.h", line 355: Warning: metaObject hides QObjectData::metaObject.
"testtypes.h", line 607: Error: "}" expected instead of ";".
"testtypes.h", line 609: Error: The function "test1() const" cannot be declared const.
"testtypes.h", line 614: Error: The function "test2() const" cannot be declared const.
"testtypes.h", line 619: Error: The function "test3() const" cannot be declared const.
"testtypes.h", line 624: Error: The function "test4() const" cannot be declared const.
"testtypes.h", line 629: Error: The function "test5() const" cannot be declared const.
"testtypes.h", line 634: Error: The function "test6() const" cannot be declared const.
"testtypes.h", line 639: Error: The function "test7() const" cannot be declared const.
"testtypes.h", line 644: Error: The function "test8() const" cannot be declared const.
"testtypes.h", line 649: Error: The function "test9() const" cannot be declared const.
"testtypes.h", line 654: Error: The function "test10() const" cannot be declared const.
"testtypes.h", line 659: Error: The function "test11() const" cannot be declared const.
"testtypes.h", line 664: Error: The function "test12() const" cannot be declared const.
"testtypes.h", line 666: Error: A declaration was expected instead of "}".

added to the patch

and then this error pops out:

/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/declarative/qdeclarativetextedit\" -DQT_NO_DEBUG -DQT_DECLARATIVE_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/QtDeclarative -I../../../../include -I../../../../include/QtTest -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/tst_qdeclarativetextedit.o tst_qdeclarativetextedit.cpp
...
"tst_qdeclarativetextedit.cpp", line 1099: Error: Could not find a match for QTest::qCompare<QTest::T>(QInputContext*, MyInputContext*, const char[20], const char[4], const char[29], int) needed in tst_qdeclarativetextedit::openInputPanelOnFocus().

added to the patch

and then this :

/export/home/test/tmp/qt/bin/moc -DSRCDIR=\"/export/home/test/tmp/qt/tests/auto/declarative/qdeclarativetextinput\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_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/QtGui -I../../../../include/QtDeclarative -I../../../../include -I../../../../include/QtTest -I.moc/release-shared -I/usr/sfw/include tst_qdeclarativetextinput.cpp -o .moc/release-shared/tst_qdeclarativetextinput.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/declarative/qdeclarativetextinput\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_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/QtGui -I../../../../include/QtDeclarative -I../../../../include -I../../../../include/QtTest -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/tst_qdeclarativetextinput.o tst_qdeclarativetextinput.cpp
...
"tst_qdeclarativetextinput.cpp", line 196: Error: Overloading ambiguity between "std::abs(int)" and "std::abs(long)".
"tst_qdeclarativetextinput.cpp", line 453: Error: Overloading ambiguity between "std::abs(int)" and "std::abs(long)".
"tst_qdeclarativetextinput.cpp", line 465: Error: Overloading ambiguity between "std::abs(int)" and "std::abs(long)".
"tst_qdeclarativetextinput.cpp", line 1025: Error: Could not find a match for QTest::qCompare<QTest::T>(QInputContext*, MyInputContext*, const char[20], const char[4], const char[30], int) needed in tst_qdeclarativetextinput::openInputPanelOnFocus().

added to the patch