Build of SVN trunk fails on window_QT.cpp (Bug #628)

The building of latest version of OpenCV from the SVN trunk (r3810) fails with the following message:

[ 55%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/window_QT.o
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:49: warning: deprecated conversion from string constant to ‘char*’
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp: In member function ‘void GuiReceiver::putText(void*, QString, QPoint, void*)’:
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:728: error: expected ‘;’ before ‘CvMat’
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:734: error: ‘mat’ was not declared in this scope
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:734: error: ‘stub’ was not declared in this scope
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp: In member function ‘void GuiReceiver::destroyAllWindow()’:
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:982: warning: comparison with string literal results in unspecified behaviour
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp: In member function ‘void ViewPort::updateImage(const CvArr*)’:
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2354: error: expected ‘;’ before ‘CvMat’
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2360: error: ‘mat’ was not declared in this scope
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2360: error: ‘stub’ was not declared in this scope
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp: In member function ‘void ViewPort::setOpenGLCallback(void ()(void), void*, double, double, double)’:
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2398: warning: statement has no effect
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2398: warning: statement has no effect
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2398: warning: statement has no effect
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2398: warning: statement has no effect
/home/dev/opencv/opencv/modules/highgui/src/window_QT.cpp:2398: warning: statement has no effect
maker2: * [modules/highgui/CMakeFiles/opencv_highgui.dir/src/window_QT.o] Error 1
maker1: * [modules/highgui/CMakeFiles/opencv_highgui.dir/all] Error 2

I am running Ubuntu Linux 10.10 amd64, fresh installed just today. I have the required dependencies (g++, cmake, Qt, ffmpeg, IPP, Eigen2, TBB), all updated.

Note that I was able to build and install OpenCV before. My guess is that the build worked because before that I installed OpenCV 2.1 from the package repository.