AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  fix compilation with namespaces
This commit is contained in:
Qt Continuous Integration System 2011-05-13 06:58:29 +10:00
commit 664517abde
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/painting/qcosmeticstroker.cpp
View File

@ -150,28 +150,28 @@ static StrokeLine strokeLine(int strokeSelection)
switch (strokeSelection) {
case Aliased|Solid|RegularDraw:
stroke = &::drawLine<drawPixel, NoDasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixel, NoDasher>;
break;
case Aliased|Solid|FastDraw:
stroke = &::drawLine<drawPixelARGB32Opaque, NoDasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixelARGB32Opaque, NoDasher>;
break;
case Aliased|Dashed|RegularDraw:
stroke = &::drawLine<drawPixel, Dasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixel, Dasher>;
break;
case Aliased|Dashed|FastDraw:
stroke = &::drawLine<drawPixelARGB32Opaque, Dasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLine)<drawPixelARGB32Opaque, Dasher>;
break;
case AntiAliased|Solid|RegularDraw:
stroke = &drawLineAA<drawPixel, NoDasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixel, NoDasher>;
break;
case AntiAliased|Solid|FastDraw:
stroke = &drawLineAA<drawPixelARGB32, NoDasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixelARGB32, NoDasher>;
break;
case AntiAliased|Dashed|RegularDraw:
stroke = &drawLineAA<drawPixel, Dasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixel, Dasher>;
break;
case AntiAliased|Dashed|FastDraw:
stroke = &drawLineAA<drawPixelARGB32, Dasher>;
stroke = &QT_PREPEND_NAMESPACE(drawLineAA)<drawPixelARGB32, Dasher>;
break;
default:
Q_ASSERT(false);