summaryrefslogtreecommitdiffstats
path: root/src/sdk/installerbase.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-11-11 14:49:17 +0100
committerKarsten Heimrich <karsten.heimrich@theqtcompany.com>2014-11-12 21:22:35 +0100
commitb1b9a3df473b3a27629be91cab0058b0e140d06d (patch)
tree3308a35c1e5148de3d29f073f515afd375c828c3 /src/sdk/installerbase.cpp
parentca0369791c672b72cf47974ba3e3a4e0b81cce28 (diff)
Rewrite the isRunning implementation and remove private class.
Use a more descriptive enum name. On Windows keep the lower case version of the process name instead of calling toLower() several times. Print a warning if we cannot obtain or release the lock. Change-Id: Iaaefae0359cd214290f62ce78677cb343da8823c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/sdk/installerbase.cpp')
-rw-r--r--src/sdk/installerbase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index f262152ae..9d3cd8885 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -72,8 +72,8 @@ InstallerBase::~InstallerBase()
int InstallerBase::run()
{
KDRunOnceChecker runCheck(QLatin1String("lockmyApp1234865.lock"));
- if (runCheck.isRunning(KDRunOnceChecker::ProcessList)
- || runCheck.isRunning(KDRunOnceChecker::Lockfile)) {
+ if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::ProcessList)
+ || runCheck.isRunning(KDRunOnceChecker::ConditionFlag::Lockfile)) {
QInstaller::MessageBoxHandler::information(0, QLatin1String("AlreadyRunning"),
QString::fromLatin1("Waiting for %1").arg(qAppName()),
QString::fromLatin1("Another %1 instance is already running. Wait "