From eda1e12268a4da50db3a91919cc12038236ce65c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Sat, 7 Apr 2012 11:59:05 +0200
Subject: [PATCH] Device Support: Fix keyword search in settings widget.

- Add auto-detection label text.
- Fix editing artifact that led to the ampersand character not being
removed from the search string.

Change-Id: I4221083e5a8d8ebfd66d9806cf96f9f6d9714d32
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
 .../projectexplorer/devicesupport/devicesettingswidget.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index e0a439300a1..e505489ab7f 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -123,10 +123,9 @@ QString DeviceSettingsWidget::searchKeywords() const
     QString rc;
     QTextStream(&rc) << m_ui->configurationLabel->text()
         << ' ' << m_ui->deviceNameLabel->text()
-        << ' ' << m_ui->nameLineEdit->text();
-    if (m_configWidget)
-    rc.remove(QLatin1Char('&'));
-    return rc;
+        << ' ' << m_ui->nameLineEdit->text()
+        << ' ' << m_ui->autoDetectionKeyLabel->text();
+    return rc.remove(QLatin1Char('&'));
 }
 
 void DeviceSettingsWidget::initGui()