diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
| commit | a46c03c0737ce5e2e5b231e448e3fc112ef1fc59 (patch) | |
| tree | 77f8bc134b8eb4515947d219af4095c2865767cc /src/lib/corelib/tools | |
| parent | 9788db406f1a3317e3904cb910eab4d518d9cf8b (diff) | |
| parent | d994e54712efb69225d73d93fc57b89a3d39cacb (diff) | |
Merge 1.12 into master
Change-Id: I72bbda4537a65bc525afc38a3d280f3c23940c12
Diffstat (limited to 'src/lib/corelib/tools')
| -rw-r--r-- | src/lib/corelib/tools/fileinfo.cpp | 4 | ||||
| -rw-r--r-- | src/lib/corelib/tools/msvcinfo.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp index a1571b954..3adacc883 100644 --- a/src/lib/corelib/tools/fileinfo.cpp +++ b/src/lib/corelib/tools/fileinfo.cpp @@ -360,8 +360,10 @@ QString applicationDirPath() FileInfo::FileInfo(const QString &fileName) { - if (stat(fileName.toLocal8Bit(), &m_stat) == -1) + if (stat(fileName.toLocal8Bit(), &m_stat) == -1) { m_stat.st_mtime = 0; + m_stat.st_mode = 0; + } } bool FileInfo::exists() const diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 27e523d90..e390c9a30 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -101,7 +101,7 @@ static QByteArray runProcess(const QString &exeFilePath, const QStringList &args process.write(pipeData); process.closeWriteChannel(); } - if (!process.waitForFinished() || process.exitStatus() != QProcess::NormalExit) + if (!process.waitForFinished(-1) || process.exitStatus() != QProcess::NormalExit) throw ErrorInfo(mkStr("Could not run %1 (%2)").arg(exeFilePath, process.errorString())); if (process.exitCode() != 0 && !allowFailure) { ErrorInfo e(mkStr("Process '%1' failed with exit code %2.") |