Merge branch 'master' of ../mainline into genericprojectmanager

README

@@ -21,3 +21,13 @@ we thank the authors who made this possible:
   Roberto Raggi <roberto.raggi@gmail.com>
   QtCreator/src/shared/cplusplus
 
+Compiling Qt Creator
+====================
+You need Qt 4.5 to build Qt Creator.
+We recommend that you build Qt Creator not in the source directory, but in a separate directory.
+To do that, use the following commands:
+mkdir $BUILD_DIRECTORY
+cd $BUILD_DIRECTORY
+qmake $SOURCE_DIRECTORY/qtcreator.pro
+make (or mingw32-make or nmake, depending on your platform)
+

src/libs/utils/filesearch.cpp

@@ -28,6 +28,7 @@
 **************************************************************************/
 
 #include "filesearch.h"
+#include <cctype>
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -231,7 +231,7 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
         return QString();
 
     const QDir absoluteDir = fi.absoluteDir();
-    const QString baseName = fi.baseName();
+    const QString baseName = fi.completeBaseName();
     const QStringList suffixes = matchingCandidateSuffixes(mimeDatase, type);
 
     const QString privateHeaderSuffix = QLatin1String("_p");

src/plugins/fakevim/fakevimhandler.cpp

@@ -1053,7 +1053,12 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
         m_opcount = m_mvcount;
         m_mvcount.clear();
         m_submode = DeleteSubMode;
-    } else if (key == 'd' && m_visualMode == VisualLineMode) {
+   } else if ((key == 'd' || key == 'x') && m_visualMode == VisualCharMode) { 
+        recordBeginGroup();
+        leaveVisualMode();
+        m_submode = DeleteSubMode;
+        finishMovement();
+   } else if ((key == 'd' || key == 'x') && m_visualMode == VisualLineMode) {
         leaveVisualMode();
         int beginLine = lineForPosition(m_marks['<']);
         int endLine = lineForPosition(m_marks['>']);
@@ -1321,7 +1326,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
             m_moveType = MoveExclusive;
         }
         finishMovement("W");
-    } else if (key == 'x') { // = "dl"
+    } else if (key == 'x' && m_visualMode == NoVisualMode) { // = "dl"
         m_moveType = MoveExclusive;
         if (atEndOfLine())
             moveLeft();
@@ -1393,7 +1398,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
             finishMovement();
         }
     } else {
-        qDebug() << "IGNORED IN COMMAND MODE: " << key << text;
+        qDebug() << "IGNORED IN COMMAND MODE: " << key << text
+            << " VISUAL: " << m_visualMode;
         handled = EventUnhandled;
     }
 

src/plugins/projectexplorer/dependenciespanel.cpp

@@ -43,9 +43,9 @@
 namespace ProjectExplorer {
 namespace Internal {
 
-///
-/// DependenciesModel
-///
+//
+// DependenciesModel
+//
 
 class DependenciesModel : public QAbstractListModel
 {
@@ -137,9 +137,9 @@ Qt::ItemFlags DependenciesModel::flags(const QModelIndex &index) const
     return rc;
 }
 
-///
-/// DependenciesWidget
-///
+//
+// DependenciesWidget
+//
 
 class DependenciesWidget : public QWidget
 {
@@ -165,9 +165,9 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
     m_ui.dependenciesView->setHeaderHidden(true);
 }
 
-///
-/// DependenciesPanel
-///
+//
+// DependenciesPanel
+//
 
 DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project)
     : PropertiesPanel()
@@ -190,9 +190,9 @@ QWidget *DependenciesPanel::widget()
     return m_widget;
 }
 
-///
-/// DependenciesPanelFactory
-///
+//
+// DependenciesPanelFactory
+//
 
 DependenciesPanelFactory::DependenciesPanelFactory(SessionManager *session)
     : m_session(session)