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

doc/qtcreator.qdoc

@@ -597,29 +597,38 @@
 
     \table
         \header
-            \o Function
+            \o  Function
-            \o Key Combination
+            \o  Key Combination
+            \o  Screenshot
         \row
-            \o Go to a line in the current document
+            \o  Go to a line in the current document
-            \o Ctrl + K, l, Space, and the line number
+            \o  Ctrl+K, l, Space, and the line number
+            \o  \image qtcreator-locator-line.png
         \row
-            \o Go to a function definition
+            \o  Go to a function definition
-            \o Ctrl + K, :, Space, and the function name
+            \o  Ctrl+K, :, Space, and the function name
         \row
-            \o Go to a help topic
+            \o  Go to a help topic
-            \o Ctrl + K, ?, Space, and the topic
+            \o  Ctrl+K, ?, Space, and the topic
+            \o  \image qtcreator-locator-help.png
         \row
-            \o Go to an opened document
+            \o  Go to an opened document
-            \o Ctrl + K, o, Space, and the document name.
+            \o  Ctrl+K, o, Space, and the document name.
         \row
-            \o Go to a file in the file system (browse the file system)
+            \o  Go to a file in the file system (browse the file system)
-            \o Ctrl + K, f, Space, and the file name.
+            \o  Ctrl+K, f, Space, and the file name.
         \row
-            \o Go to a file in any project currently loaded
+            \o  Go to a file in any project currently loaded
-            \o Ctrl + K, a, Space, and the function name.
+            \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  Go to a file in the current project
-            \o Ctrl + K, p, Space, and the function name.
+            \o  Ctrl+K, p, Space, and the function name.
+
+        \row
+            \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
 */
 

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);