diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 06d7c54550deca46613c235063dc0e1e41b71209..f399a148f6d9d8c0cf2ae3faca49dc7f57ee74a5 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -641,7 +641,7 @@ int ffsll(quint64 i) #endif #ifdef Q_OS_NACL_NEWLIB -# define ffs __builtin_ffs +# define ffsll __builtin_ffsll #endif #ifdef Q_ATOMIC_INT64_IS_SUPPORTED diff --git a/src/tools/nacldeployqt/main.cpp b/src/tools/nacldeployqt/main.cpp index 2c8ab6473eef0852c258713899f25e46a8360ef9..aa86fd9a0ffb239d7afe9bdaaa155791f57f2032 100644 --- a/src/tools/nacldeployqt/main.cpp +++ b/src/tools/nacldeployqt/main.cpp @@ -264,7 +264,8 @@ int QtNaclDeployer::deploy() QString chromeOpenAppOptions = " --load-and-launch-app=" + outDir; QString chromeOpenWindowOptions = " --incognito --new-window \"http://localhost:8000\""; QString chromeOpenOptions = isApp ? chromeOpenAppOptions : chromeOpenWindowOptions; - QString chromeRedirectOptions = testlibMode ? " 1>" + stdoutCaptureFile + " 2>" + stderrCaptureFile: " "; + QString chromeRedirectOptions = testlibMode ? + QString(" 1>") + stdoutCaptureFile + QString(" 2>") + stderrCaptureFile : QStringLiteral(" "); if (print) { qDebug() << "chrome:";