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

tst_moc: pass -std=c++11 when calling the compiler

Browse Source 
Change-Id: I9e299c6d889f5f2f40275a375345edbde29909d1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2015-11-12 08:20:35 +01:00 committed by Olivier Goffart (Woboq GmbH)
parent 643235988a
commit 1331b6a703
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/tools/moc/tst_moc.cpp
View File

@ -701,7 +701,7 @@ void tst_Moc::oldStyleCasts()
QStringList args; QStringList args;
args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "." args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "."
<< "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-"; << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
proc.start("gcc", args); proc.start("gcc", args);
QVERIFY(proc.waitForStarted()); QVERIFY(proc.waitForStarted());
proc.write(mocOut); proc.write(mocOut);
@ -771,7 +771,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension()
QStringList args; QStringList args;
args << "-c" << "-x" << "c++" << "-I" << ".." args << "-c" << "-x" << "c++" << "-I" << ".."
<< "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-"; << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
proc.start("gcc", args); proc.start("gcc", args);
QVERIFY(proc.waitForStarted()); QVERIFY(proc.waitForStarted());
proc.write(mocOut); proc.write(mocOut);
@ -1050,7 +1050,8 @@ void tst_Moc::ignoreOptionClashes()
// If -pthread wasn't ignored, it was parsed as a prefix of "thread/", which breaks compilation. // If -pthread wasn't ignored, it was parsed as a prefix of "thread/", which breaks compilation.
QStringList gccArgs; QStringList gccArgs;
gccArgs << "-c" << "-x" << "c++" << "-I" << ".." gccArgs << "-c" << "-x" << "c++" << "-I" << ".."
<< "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null" << "-fPIC" << "-"; << "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null"
<< "-fPIC" << "-std=c++11" << "-";
proc.start("gcc", gccArgs); proc.start("gcc", gccArgs);
QVERIFY(proc.waitForStarted()); QVERIFY(proc.waitForStarted());
proc.write(mocOut); proc.write(mocOut);