Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

8 files changed, 26 insertions, 17 deletions

diff --git a/doc/qtcreator-locator-classes.png b/doc/qtcreator-locator-classes.png
new file mode 100644
index 00000000000..a2ab94de6d1
--- /dev/null
+++ b/doc/qtcreator-locator-classes.png
diff --git a/doc/qtcreator-locator-files.png b/doc/qtcreator-locator-files.png
new file mode 100644
index 00000000000..1ad456617e1
--- /dev/null
+++ b/doc/qtcreator-locator-files.png
diff --git a/doc/qtcreator-locator-filesystem.png b/doc/qtcreator-locator-filesystem.png
new file mode 100644
index 00000000000..aa9c7d4c9a1
--- /dev/null
+++ b/doc/qtcreator-locator-filesystem.png
diff --git a/doc/qtcreator-locator-help.png b/doc/qtcreator-locator-help.png
new file mode 100644
index 00000000000..31d1203bf52
--- /dev/null
+++ b/doc/qtcreator-locator-help.png
diff --git a/doc/qtcreator-locator-line.png b/doc/qtcreator-locator-line.png
new file mode 100644
index 00000000000..494717215bb
--- /dev/null
+++ b/doc/qtcreator-locator-line.png
diff --git a/doc/qtcreator-locator-methods.png b/doc/qtcreator-locator-methods.png
new file mode 100644
index 00000000000..4494213de1b
--- /dev/null
+++ b/doc/qtcreator-locator-methods.png
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 9ef83d0a8b0..85a112dac94 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -597,29 +597,38 @@
 
     \table
         \header
-            \o Function
-            \o Key Combination
+            \o  Function
+            \o  Key Combination
+            \o  Screenshot
         \row
-            \o Go to a line in the current document
-            \o Ctrl + K, l, Space, and the line number
+            \o  Go to a line in the current document
+            \o  Ctrl+K, l, Space, and the line number
+            \o  \image qtcreator-locator-line.png
         \row
-            \o Go to a function definition
-            \o Ctrl + K, :, Space, and the function name
+            \o  Go to a function definition
+            \o  Ctrl+K, :, Space, and the function name
         \row
-            \o Go to a help topic
-            \o Ctrl + K, ?, Space, and the topic
+            \o  Go to a help topic
+            \o  Ctrl+K, ?, Space, and the topic
+            \o  \image qtcreator-locator-help.png
         \row
-            \o Go to an opened document
-            \o Ctrl + K, o, Space, and the document name.
+            \o  Go to an opened document
+            \o  Ctrl+K, o, Space, and the document name.
         \row
-            \o Go to a file in the file system (browse the file system)
-            \o Ctrl + K, f, Space, and the file name.
+            \o  Go to a file in the file system (browse the file system)
+            \o  Ctrl+K, f, Space, and the file name.
         \row
-            \o Go to a file in any project currently loaded
-            \o Ctrl + K, a, Space, and the function name.
+            \o  Go to a file in any project currently loaded
+            \o  Ctrl+K, a, Space, and the function name.
+            \o  \image qtcreator-locator-files.png
+        \row
+            \o  Go to a file in the current project
+            \o  Ctrl+K, p, Space, and the function name.
+
         \row
-            \o Go to a file in the current project
-            \o Ctrl + K, p, Space, and the function name.
+            \o  Go to a class in the current project
+            \o  Ctrl+K, c, Space, and the class name.
+            \o  \image qtcreator-locator-classes.png
     \endtable
 */
 
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 68bb6f5fdfb..d881a2e6db3 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -311,7 +311,7 @@ QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
             rowInResult = findInResultInsertPosition(item.name);
         int rowInChanges = findInChangesInsertPosition(item.name);
 
-        qDebug()<<"addVariable "<<item.name<<existsInBaseEnvironment<<rowInResult<<rowInChanges;
+        //qDebug() << "addVariable " << item.name << existsInBaseEnvironment << rowInResult << rowInChanges;
 
         if (existsInBaseEnvironment) {
             m_items.insert(rowInChanges, item);