From 46a1c26070719d0d77bbb0bbcd80e5ca43412097 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Mon, 23 Aug 2010 18:07:14 +0200
Subject: [PATCH] Fix possible race condition
Discovered with change b7fd293098 in Qt master
---
src/plugins/locator/locatorplugin.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/locator/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp
index 98711b4a694..a2476b02144 100644
--- a/src/plugins/locator/locatorplugin.cpp
+++ b/src/plugins/locator/locatorplugin.cpp
@@ -145,8 +145,8 @@ void LocatorPlugin::extensionsInitialized()
void LocatorPlugin::startSettingsLoad()
{
- m_loadWatcher.setFuture(QtConcurrent::run(this, &LocatorPlugin::loadSettings));
connect(&m_loadWatcher, SIGNAL(finished()), this, SLOT(settingsLoaded()));
+ m_loadWatcher.setFuture(QtConcurrent::run(this, &LocatorPlugin::loadSettings));
}
void LocatorPlugin::loadSettings()
--
GitLab