From 11494d7a1246ff395a8bcd92abcd10a3eb16f41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?=
<morten.sorvig@theqtcompany.com>
Date: Wed, 27 Jan 2016 20:24:25 +0100
Subject: [PATCH] Compile after merge.
---
src/corelib/tools/qsimd.cpp | 2 +-
src/tools/nacldeployqt/main.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 06d7c54550d..f399a148f6d 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 2c8ab6473ee..aa86fd9a0ff 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:";
--
GitLab