diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
| commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
| tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /src/corelib/io | |
| parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
| parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qlockfile_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qlockfile_win.cpp b/src/corelib/io/qlockfile_win.cpp index 8cbe0a9dfd..5bd1ba04c9 100644 --- a/src/corelib/io/qlockfile_win.cpp +++ b/src/corelib/io/qlockfile_win.cpp @@ -132,7 +132,7 @@ bool QLockFilePrivate::isApparentlyStale() const // processes due to sandboxing #ifndef Q_OS_WINRT if (getLockInfo(&pid, &hostname, &appname)) { - if (hostname == QString::fromLocal8Bit(localHostName())) { + if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) { HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); if (!procHandle) return true; |