[master] Qt build failing during build of fsl-image-gui

[John Weber <rjohnweber@gmail.com>]

I'm attempting to build fsl-image-gui and I'm using master (synced a couple of 
days ago).  It's failing consistently when compiling Qt:

| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (see 
/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/work/wandboard_dual-poky-linux-gnueabi/qt4-x11-free/4.8.4-r51.3/temp/log.do_compile.1605 
for further information)
ERROR: Task 418 
(/mnt/YOCTOFSL/fsl-community-bsp/sources/poky/meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb, 
do_compile) failed with exit code '1'

Avoiding posting the entire log here.  ;-)  But, here is the error from a 
snipped of the log:

~~~~~~~~~~
| arm-poky-linux-gnueabi-g++  -march=armv7-a     -mthumb-interwork 
-mfloat-abi=softfp -mfpu=neon 
--sysroot=/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual -c 
-O2 -pipe -g -feliminate-unused-debug-types -fpermissive 
-fvisibility-inlines-hidden 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/include/mysql 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/include/postgresql 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/src/kernel/include/ 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/include 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/include/freetype2 
-O2 -O2 -Wall -W -Wall -W -Wall -W -D_REENTRANT -DQT_WEBKIT -DQT_OPENGL_SUPPORT 
-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_OPENGL_LIB 
-DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I../../mkspecs/linux-g++ -I. 
-I../../include/QtCore -I../../include/QtGui -I../../include/QtOpenGL 
-I../../include -I../shared 
-I/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/sysroots/wandboard-dual/usr/include/freetype2 
-I.moc/release-shared -o .obj/release-shared/main.o main.cpp
| In file included from ../../include/QtCore/qtconcurrentmapkernel.h:1:0,
|                  from 
../../include/QtCore/../../src/corelib/concurrent/qtconcurrentfilterkernel.h:50,
|                  from ../../include/QtCore/qtconcurrentfilterkernel.h:1,
|                  from 
../../include/QtCore/../../src/corelib/concurrent/qtconcurrentfilter.h:49,
|                  from ../../include/QtCore/qtconcurrentfilter.h:1,
|                  from ../../include/QtCore/QtCore:53,
|                  from ../../include/QtGui/QtGui:3,
|                  from gradients.h:47,
|                  from main.cpp:42:
| ../../include/QtCore/../../src/corelib/concurrent/qtconcurrentmapkernel.h: In 
function 'QtConcurrent::ThreadEngineStarter<ResultType> 
QtConcurrent::startMappedReduced(Iterator, Iterator, MapFunctor, ReduceFunctor, 
QtConcurrent::ReduceOptions)':
| 
../../include/QtCore/../../src/corelib/concurrent/qtconcurrentmapkernel.h:262:1: 
error: expected primary-expression before '}' token
| 
../../include/QtCore/../../src/corelib/concurrent/qtconcurrentmapkernel.h:262:1: 
error: expected ';' before '}' token
| make[2]: *** [.obj/release-shared/main.o] Error 1
| make[2]: Leaving directory 
`/mnt/YOCTOFSL/fsl-community-bsp/build/tmp/work/wandboard_dual-poky-linux-gnueabi/qt4-x11-free/4.8.4-r51.3/qt-everywhere-opensource-src-4.8.4/demos/gradients'
| make[1]: *** [sub-gradients-make_default] Error 2
~~~~~~~~~~

Taking a look at the source, I don't see a problem:
File: 
fsl-community-bsp/build/tmp/work/wandboard_dual-poky-linux-gnueabi/qt4-x11-free/4.8.4-r51.3/qt-everywhere-opensource-src-4.8.4/src/corelib/concurrent/qtconcurrentmapkernel.h:

~~~~~~~~
template <typename IntermediateType, typename ResultType, typename Iterator, 
typename MapFunctor, typename ReduceFunctor>
inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, 
Iterator end,
                                                            MapFunctor 
mapFunctor, ReduceFunctor reduceFunctor,
                                                            ReduceOptions options)
{
     typedef ReduceKernel<ReduceFunctor, ResultType, IntermediateType> Reducer;
     typedef MappedReducedKernel<ResultType, Iterator, MapFunctor, 
ReduceFunctor, Reducer> MappedReduceType;
     return startThreadEngine(new MappedReduceType(begin, end, mapFunctor, 
reduceFunctor, options));   <<<<----- Line in question
}

} // namespace QtConcurrent
~~~~~~~~~

Is it possible that the problem is related to the toolchain?

John