Merge lp:~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate into lp:qtcreator-plugin-cmake

[Benjamin Zeller]

Migrating to Qt5.3 and QtC 3.1

Migrating to Qt5.3 and QtC 3.1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-cmake-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate]

40. By Benjamin Zeller on 2014-06-16

Update versions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-cmake-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate]

41. By Benjamin Zeller on 2014-06-16

Packaging fixes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-cmake-ci/12/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-02 16:27:01 +0000
+++ debian/changelog	2014-06-16 10:00:33 +0000
@@ -1,3 +1,9 @@
+qtcreator-plugin-cmake (3.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Migrating to Qt5.3 and QtC 3.1
+
+ -- Benjamin Zeller <[e-mail]>  Mon, 16 Jun 2014 11:47:29 +0200
+
 qtcreator-plugin-cmake (3.0.1+14.10.20140502.6-0ubuntu1) utopic; urgency=low
 
   [ Benjamin Zeller ]

=== modified file 'debian/control'
--- debian/control	2014-04-01 13:30:37 +0000
+++ debian/control	2014-06-16 10:00:33 +0000
@@ -4,13 +4,13 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libqt5webkit5-dev,
-               libqt5widgets5 (>= 5.0.2~),
+               libqt5widgets5 (>= 5.3.0~),
                libsqlite3-dev,
-               qt5-qmake (>= 5.2.1~),
-               qtcreator-dev (>= 3.0.1),
-               qttools5-dev-tools (>= 5.2.1~),
+               qt5-qmake (>= 5.3.0~),
+               qtcreator-dev (>= 3.1.0),
+               qttools5-dev-tools (>= 5.3.0~),
                qtxmlpatterns5-dev-tools,
-               qtcreator-plugin-remotelinux-dev,
+               qtcreator-plugin-remotelinux-dev (>= 3.1.1~),
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/qtcreator-plugin-cmake
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging changes,
@@ -22,7 +22,7 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qtcreator-plugin-remotelinux,
+         qtcreator-plugin-remotelinux (>= 3.1.1~),
 Replaces: qtcreator (<= 2.8.2)
 Breaks: qtcreator (<= 2.8.2)
 Description: CMake plugin for Qt Creator IDE
@@ -37,7 +37,7 @@
 Architecture: any
 Depends: qtcreator-plugin-cmake (= ${binary:Version}),
          ${misc:Depends},
-         qtcreator-plugin-remotelinux-dev,
+         qtcreator-plugin-remotelinux-dev (>= 3.1.1~),
 Replaces: qtcreator-dev (<= 2.8.2)
 Breaks: qtcreator-dev (<= 2.8.2)
 Description: Qt Creator cmake plugin development files

=== modified file 'share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml'
--- share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml	2014-02-25 10:05:29 +0000
+++ share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml	2014-06-16 10:00:33 +0000
@@ -34,7 +34,7 @@
         class="cmakeapp-project">
     <icon>console.png</icon>
     <description>Creates a plain C project using CMake, not using the Qt library.</description>
-    <displayname>Plain C Project (Ubuntu CMake Build)</displayname>;
+    <displayname>Plain C Project (CMake Build)</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
         <file source="main.c" target="main.c" openeditor="true"/>

=== modified file 'share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml'
--- share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml	2014-02-25 10:05:29 +0000
+++ share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml	2014-06-16 10:00:33 +0000
@@ -34,7 +34,7 @@
         class="cmakeapp-project">
     <icon>console.png</icon>
     <description>Creates a plain C++ project using CMake, not using the Qt library.</description>
-    <displayname>Plain C++ Project (Ubuntu CMake Build)</displayname>;
+    <displayname>Plain C++ Project (CMake Build)</displayname>;
     <displaycategory>Non-Qt Project</displaycategory>
     <files>
         <file source="main.cpp" target="main.cpp" openeditor="true"/>

=== modified file 'src/cmakeprojectmanager/argumentslineedit.cpp'
--- src/cmakeprojectmanager/argumentslineedit.cpp	2014-02-24 14:43:48 +0000
+++ src/cmakeprojectmanager/argumentslineedit.cpp	2014-06-16 10:00:33 +0000
@@ -33,14 +33,14 @@
 namespace CMakeProjectManager {
 
 ArgumentsLineEdit::ArgumentsLineEdit(QWidget *parent) :
-    Utils::BaseValidatingLineEdit(parent)
+    Utils::FancyLineEdit(parent)
 {
 }
 
 bool ArgumentsLineEdit::validate(const QString &value, QString *errorMessage) const
 {
     Utils::QtcProcess::SplitError err = Utils::QtcProcess::SplitOk;
-    Utils::QtcProcess::splitArgs(value,false,&err);
+    Utils::QtcProcess::splitArgs(value,Utils::HostOsInfo::hostOs(),false,&err);
 
     if(err != Utils::QtcProcess::SplitOk) {
         if(err == Utils::QtcProcess::BadQuoting)

=== modified file 'src/cmakeprojectmanager/argumentslineedit.h'
--- src/cmakeprojectmanager/argumentslineedit.h	2014-02-24 14:43:48 +0000
+++ src/cmakeprojectmanager/argumentslineedit.h	2014-06-16 10:00:33 +0000
@@ -31,11 +31,11 @@
 #define CMAKEPROJECTMANAGER_ARGUMENTSLINEEDIT_H
 
 #include "cmakeprojectmanager_global.h"
-#include <utils/basevalidatinglineedit.h>
+#include <utils/fancylineedit.h>
 
 namespace CMakeProjectManager {
 
-class CMAKEPROJECTMANAGER_EXPORT ArgumentsLineEdit : public Utils::BaseValidatingLineEdit
+class CMAKEPROJECTMANAGER_EXPORT ArgumentsLineEdit : public Utils::FancyLineEdit
 {
     Q_OBJECT
 public:

=== modified file 'src/cmakeprojectmanager/cmakeappwizard.cpp'
--- src/cmakeprojectmanager/cmakeappwizard.cpp	2014-03-12 09:06:14 +0000
+++ src/cmakeprojectmanager/cmakeappwizard.cpp	2014-06-16 10:00:33 +0000
@@ -91,11 +91,6 @@
     return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l ,errorMessage);
 }
 
-void CMakeAppWizard::registerSelf()
-{
-    ProjectExplorer::CustomWizard::registerFactory<CMakeAppWizard>(QLatin1String("cmakeapp-project"));
-}
-
 CMakeAppWizardDialog::CMakeAppWizardDialog(QWidget *parent, const Core::WizardDialogParameters &parameters)
     : ProjectExplorer::BaseProjectWizardDialog(parent,parameters)
     , m_targetSetupPage(0)

=== modified file 'src/cmakeprojectmanager/cmakeappwizard.h'
--- src/cmakeprojectmanager/cmakeappwizard.h	2014-03-12 09:06:14 +0000
+++ src/cmakeprojectmanager/cmakeappwizard.h	2014-06-16 10:00:33 +0000
@@ -53,7 +53,6 @@
 
 public:
     CMakeAppWizard();
-    static void registerSelf();
 
 private:
     QWizard *createWizardDialog(QWidget *parent,

=== modified file 'src/cmakeprojectmanager/cmakebuildconfiguration.cpp'
--- src/cmakeprojectmanager/cmakebuildconfiguration.cpp	2014-04-17 11:46:53 +0000
+++ src/cmakeprojectmanager/cmakebuildconfiguration.cpp	2014-06-16 10:00:33 +0000
@@ -66,7 +66,7 @@
                                                  CMakeBuildConfiguration *source) :
     BuildConfiguration(parent, source),
     m_msvcVersion(source->m_msvcVersion),
-    m_useNinja(false)
+    m_useNinja(source->m_useNinja)
 {
     Q_ASSERT(parent);
     cloneSteps(source);

=== modified file 'src/cmakeprojectmanager/cmakebuildconfiguration.h'
--- src/cmakeprojectmanager/cmakebuildconfiguration.h	2014-02-28 11:28:18 +0000
+++ src/cmakeprojectmanager/cmakebuildconfiguration.h	2014-06-16 10:00:33 +0000
@@ -34,9 +34,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/abi.h>
 
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
 
 namespace CMakeProjectManager {
 class CMakeBuildInfo;

=== modified file 'src/cmakeprojectmanager/cmakeeditor.cpp'
--- src/cmakeprojectmanager/cmakeeditor.cpp	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeeditor.cpp	2014-06-16 10:00:33 +0000
@@ -31,7 +31,6 @@
 
 #include "cmakefilecompletionassist.h"
 #include "cmakehighlighter.h"
-#include "cmakeeditorfactory.h"
 #include "cmakeprojectconstants.h"
 #include "cmakeproject.h"
 
@@ -60,25 +59,20 @@
 CMakeEditor::CMakeEditor(CMakeEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
     setContext(Core::Context(CMakeProjectManager::Constants::C_CMAKEEDITOR,
               TextEditor::Constants::C_TEXTEDITOR));
     connect(document(), SIGNAL(changed()), this, SLOT(markAsChanged()));
 }
 
-Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
+Core::IEditor *CMakeEditor::duplicate()
 {
-    CMakeEditorWidget *w = qobject_cast<CMakeEditorWidget*>(widget());
-    CMakeEditorWidget *ret = new CMakeEditorWidget(parent, w->factory(), w->actionHandler());
-    ret->duplicateFrom(w);
+    CMakeEditorWidget *ret = new CMakeEditorWidget(
+                qobject_cast<CMakeEditorWidget *>(editorWidget()));
     TextEditor::TextEditorSettings::initializeEditor(ret);
     return ret->editor();
 }
 
-Core::Id CMakeEditor::id() const
-{
-    return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
-}
-
 TextEditor::CompletionAssistProvider *CMakeEditor::completionAssistProvider()
 {
     return ExtensionSystem::PluginManager::getObject<CMakeFileCompletionAssistProvider>();
@@ -116,19 +110,22 @@
 // CMakeEditor
 //
 
-CMakeEditorWidget::CMakeEditorWidget(QWidget *parent, CMakeEditorFactory *factory, TextEditor::TextEditorActionHandler *ah)
-    : BaseTextEditorWidget(parent), m_factory(factory), m_ah(ah)
-{
-    QSharedPointer<CMakeDocument> doc(new CMakeDocument);
-    doc->setMimeType(QLatin1String(CMakeProjectManager::Constants::CMAKEMIMETYPE));
-    setBaseTextDocument(doc);
-
-    baseTextDocument()->setSyntaxHighlighter(new CMakeHighlighter);
-
+CMakeEditorWidget::CMakeEditorWidget(QWidget *parent)
+    : BaseTextEditorWidget(new CMakeDocument(), parent)
+{
+    ctor();
+}
+
+CMakeEditorWidget::CMakeEditorWidget(CMakeEditorWidget *other)
+    : BaseTextEditorWidget(other)
+{
+    ctor();
+}
+
+void CMakeEditorWidget::ctor()
+{
     m_commentDefinition.clearCommentStyles();
     m_commentDefinition.singleLine = QLatin1Char('#');
-
-    ah->setupActions(this);
 }
 
 TextEditor::BaseTextEditor *CMakeEditorWidget::createEditor()
@@ -203,7 +200,7 @@
 
     // TODO: Resolve variables
 
-    QDir dir(QFileInfo(editorDocument()->filePath()).absolutePath());
+    QDir dir(QFileInfo(baseTextDocument()->filePath()).absolutePath());
     QString fileName = dir.filePath(buffer);
     QFileInfo fi(fileName);
     if (fi.exists()) {
@@ -230,6 +227,8 @@
 CMakeDocument::CMakeDocument()
     : TextEditor::BaseTextDocument()
 {
+    setMimeType(QLatin1String(CMakeProjectManager::Constants::CMAKEMIMETYPE));
+    setSyntaxHighlighter(new CMakeHighlighter);
 }
 
 QString CMakeDocument::defaultPath() const

=== modified file 'src/cmakeprojectmanager/cmakeeditor.h'
--- src/cmakeprojectmanager/cmakeeditor.h	2014-02-28 11:28:18 +0000
+++ src/cmakeprojectmanager/cmakeeditor.h	2014-06-16 10:00:33 +0000
@@ -30,17 +30,13 @@
 #ifndef CMAKEEDITOR_H
 #define CMAKEEDITOR_H
 
-#include "cmakeeditorfactory.h"
-
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/codeassist/completionassistprovider.h>
 #include <utils/uncommentselection.h>
 
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
 namespace CMakeProjectManager {
 class CMakeManager;
@@ -58,8 +54,7 @@
     CMakeEditor(CMakeEditorWidget *);
 
     bool duplicateSupported() const { return true; }
-    Core::IEditor *duplicate(QWidget *parent);
-    Core::Id id() const;
+    Core::IEditor *duplicate();
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 
 private slots:
@@ -72,13 +67,11 @@
     Q_OBJECT
 
 public:
-    CMakeEditorWidget(QWidget *parent, CMakeEditorFactory *factory, TextEditor::TextEditorActionHandler *ah);
+    CMakeEditorWidget(QWidget *parent = 0);
+    CMakeEditorWidget(CMakeEditorWidget *other);
 
     bool save(const QString &fileName = QString());
 
-    CMakeEditorFactory *factory() { return m_factory; }
-    TextEditor::TextEditorActionHandler *actionHandler() const { return m_ah; }
-
     Link findLinkAt(const QTextCursor &cursor, bool resolveTarget = true, bool inNextSplit = false);
 
 protected:
@@ -89,8 +82,8 @@
     void unCommentSelection();
 
 private:
-    CMakeEditorFactory *m_factory;
-    TextEditor::TextEditorActionHandler *m_ah;
+    CMakeEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
+    void ctor();
     Utils::CommentDefinition m_commentDefinition;
 };
 

=== modified file 'src/cmakeprojectmanager/cmakeeditorfactory.cpp'
--- src/cmakeprojectmanager/cmakeeditorfactory.cpp	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeeditorfactory.cpp	2014-06-16 10:00:33 +0000
@@ -52,8 +52,7 @@
     setDisplayName(tr(CMakeProjectManager::Constants::CMAKE_EDITOR_DISPLAY_NAME));
     addMimeType(CMakeProjectManager::Constants::CMAKEMIMETYPE);
 
-    m_actionHandler =
-            new TextEditorActionHandler(Constants::C_CMAKEEDITOR,
+    new TextEditorActionHandler(this, Constants::C_CMAKEEDITOR,
             TextEditorActionHandler::UnCommentSelection
             | TextEditorActionHandler::JumpToFileUnderCursor);
 
@@ -70,9 +69,9 @@
     contextMenu->addAction(cmd);
 }
 
-Core::IEditor *CMakeEditorFactory::createEditor(QWidget *parent)
+Core::IEditor *CMakeEditorFactory::createEditor()
 {
-    CMakeEditorWidget *rc = new CMakeEditorWidget(parent, this, m_actionHandler);
+    CMakeEditorWidget *rc = new CMakeEditorWidget();
     TextEditor::TextEditorSettings::initializeEditor(rc);
     return rc->editor();
 }

=== modified file 'src/cmakeprojectmanager/cmakeeditorfactory.h'
--- src/cmakeprojectmanager/cmakeeditorfactory.h	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeeditorfactory.h	2014-06-16 10:00:33 +0000
@@ -34,8 +34,6 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-namespace TextEditor { class TextEditorActionHandler; }
-
 namespace CMakeProjectManager {
 namespace Internal {
 
@@ -45,12 +43,11 @@
 
 public:
     CMakeEditorFactory(CMakeManager *parent);
-    Core::IEditor *createEditor(QWidget *parent);
+    Core::IEditor *createEditor();
 
 private:
     const QStringList m_mimeTypes;
     CMakeManager *m_manager;
-    TextEditor::TextEditorActionHandler *m_actionHandler;
 };
 
 } // namespace Internal

=== modified file 'src/cmakeprojectmanager/cmakekitinformation.cpp'
--- src/cmakeprojectmanager/cmakekitinformation.cpp	2014-04-05 16:29:58 +0000
+++ src/cmakeprojectmanager/cmakekitinformation.cpp	2014-06-16 10:00:33 +0000
@@ -103,7 +103,7 @@
 Core::Id CMakeKitInformation::cmakeToolId(const Kit *kit)
 {
     Core::Id test = Core::Id::fromSetting(kit->value(CMakeKitInformation::id()));
-    qDebug()<<"Id for kit: "<<kit->displayName()<<" "<<test.toString()<<" "<<test.uniqueIdentifier();
+    //qDebug()<<"Id for kit: "<<kit->displayName()<<" "<<test.toString()<<" "<<test.uniqueIdentifier();
     return test;
 }
 

=== modified file 'src/cmakeprojectmanager/cmakelocatorfilter.cpp'
--- src/cmakeprojectmanager/cmakelocatorfilter.cpp	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakelocatorfilter.cpp	2014-06-16 10:00:33 +0000
@@ -64,17 +64,17 @@
 
 }
 
-QList<Locator::FilterEntry> CMakeLocatorFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry)
+QList<Core::LocatorFilterEntry> CMakeLocatorFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
 {
     Q_UNUSED(future)
-    QList<Locator::FilterEntry> result;
+    QList<Core::LocatorFilterEntry> result;
 
     foreach (Project *p, SessionManager::projects()) {
         CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p);
         if (cmakeProject) {
             foreach (const CMakeBuildTarget &ct, cmakeProject->buildTargets()) {
                 if (ct.title.contains(entry)) {
-                    Locator::FilterEntry entry(this, ct.title, cmakeProject->projectFilePath());
+                    Core::LocatorFilterEntry entry(this, ct.title, cmakeProject->projectFilePath());
                     entry.extraInfo = FileUtils::shortNativePath(
                         FileName::fromString(cmakeProject->projectFilePath()));
                     result.append(entry);
@@ -86,7 +86,7 @@
     return result;
 }
 
-void CMakeLocatorFilter::accept(Locator::FilterEntry selection) const
+void CMakeLocatorFilter::accept(Core::LocatorFilterEntry selection) const
 {
     // Get the project containing the target selected
     CMakeProject *cmakeProject = 0;

=== modified file 'src/cmakeprojectmanager/cmakelocatorfilter.h'
--- src/cmakeprojectmanager/cmakelocatorfilter.h	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakelocatorfilter.h	2014-06-16 10:00:33 +0000
@@ -30,14 +30,14 @@
 #ifndef CMAKELOCATORFILTER_H
 #define CMAKELOCATORFILTER_H
 
-#include <locator/ilocatorfilter.h>
+#include <coreplugin/locator/ilocatorfilter.h>
 
 #include <QIcon>
 
 namespace CMakeProjectManager {
 namespace Internal {
 
-class CMakeLocatorFilter : public Locator::ILocatorFilter
+class CMakeLocatorFilter : public Core::ILocatorFilter
 {
     Q_OBJECT
 
@@ -45,8 +45,8 @@
     CMakeLocatorFilter();
     ~CMakeLocatorFilter();
 
-    QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
-    void accept(Locator::FilterEntry selection) const;
+    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry);
+    void accept(Core::LocatorFilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 private slots:

=== modified file 'src/cmakeprojectmanager/cmakeopenprojectwizard.cpp'
--- src/cmakeprojectmanager/cmakeopenprojectwizard.cpp	2014-02-24 10:10:11 +0000
+++ src/cmakeprojectmanager/cmakeopenprojectwizard.cpp	2014-06-16 10:00:33 +0000
@@ -70,8 +70,9 @@
 /// CMakeOpenProjectWizard
 //////////////
 
-CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env)
-    : m_cmakeManager(cmakeManager),
+CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env)
+    : Utils::Wizard(parent),
+      m_cmakeManager(cmakeManager),
       m_sourceDirectory(sourceDirectory),
       m_environment(env),
       m_useNinja(false),
@@ -96,9 +97,10 @@
     init();
 }
 
-CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, CMakeOpenProjectWizard::Mode mode,
+CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, CMakeOpenProjectWizard::Mode mode,
                                                const CMakeBuildInfo *info)
-    : m_cmakeManager(cmakeManager),
+    : Utils::Wizard(parent),
+      m_cmakeManager(cmakeManager),
       m_sourceDirectory(info->sourceDirectory),
       m_environment(info->environment),
       m_useNinja(info->useNinja),
@@ -246,7 +248,7 @@
     layout->addWidget(m_descriptionLabel);
 
     m_optionsButton = new QPushButton;
-    m_optionsButton->setText(tr("Show Options"));
+    m_optionsButton->setText(Core::ICore::msgShowOptionsDialog());
 
     connect(m_optionsButton, SIGNAL(clicked()),
             this, SLOT(showOptions()));
@@ -322,6 +324,7 @@
     m_pc->setBaseDirectory(m_cmakeWizard->sourceDirectory());
     m_pc->setPath(m_cmakeWizard->buildDirectory());
     m_pc->setExpectedKind(Utils::PathChooser::Directory);
+    m_pc->setHistoryCompleter(QLatin1String("Cmake.BuildDir.History"));
     connect(m_pc, SIGNAL(changed(QString)), this, SLOT(buildDirectoryChanged()));
     fl->addRow(tr("Build directory:"), m_pc);
     setTitle(tr("Build Location"));
@@ -345,6 +348,7 @@
     // Show a field for the user to enter
     m_cmakeExecutable = new Utils::PathChooser(this);
     m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand);
+    m_cmakeExecutable->setHistoryCompleter(QLatin1String("Cmake.Command.History"));
     fl->addRow(tr("CMake Executable:"), m_cmakeExecutable);
 
     connect(m_cmakeExecutable, SIGNAL(editingFinished()),
@@ -590,7 +594,7 @@
     m_cmakeWizard->setKit(generatorInfo.kit());
     m_cmakeWizard->setUseNinja(generatorInfo.isNinja());
 
-    // If mode is initial the user chooses the kit, otherwise it's already choosen
+    // If mode is initial the user chooses the kit, otherwise it's already chosen
     // and the environment already contains the kit
     if (m_mode == Initial)
         generatorInfo.kit()->addToEnvironment(env);

=== modified file 'src/cmakeprojectmanager/cmakeopenprojectwizard.h'
--- src/cmakeprojectmanager/cmakeopenprojectwizard.h	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeopenprojectwizard.h	2014-06-16 10:00:33 +0000
@@ -50,9 +50,7 @@
 class PathChooser;
 }
 
-namespace ProjectExplorer {
-class Kit;
-}
+namespace ProjectExplorer { class Kit; }
 
 namespace CMakeProjectManager {
 namespace Internal {
@@ -72,12 +70,12 @@
     };
 
     /// used at importing a project without a .user file
-    CMakeOpenProjectWizard(CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env);
+    CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, const QString &sourceDirectory, Utils::Environment env);
 
     /// used to update if we have already a .user file
     /// recreates or updates the cbp file
     /// Also used to change the build directory of one buildconfiguration or create a new buildconfiguration
-    CMakeOpenProjectWizard(CMakeManager *cmakeManager, Mode mode, const CMakeBuildInfo *info);
+    CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cmakeManager, Mode mode, const CMakeBuildInfo *info);
 
     QString buildDirectory() const;
     QString sourceDirectory() const;

=== modified file 'src/cmakeprojectmanager/cmakeproject.cpp'
--- src/cmakeprojectmanager/cmakeproject.cpp	2014-04-17 11:46:53 +0000
+++ src/cmakeprojectmanager/cmakeproject.cpp	2014-06-16 10:00:33 +0000
@@ -100,6 +100,7 @@
       m_rootNode(new CMakeProjectNode(fileName)),
       m_watcher(new QFileSystemWatcher(this))
 {
+    setId(Constants::CMAKEPROJECT_ID);
     setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT));
     setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
 
@@ -337,20 +338,35 @@
         part->displayName = displayName();
         part->projectFile = projectFilePath();
 
-        part->evaluateToolchain(tc,
-                                cxxflags,
-                                cxxflags,
-                                SysRootKitInformation::sysRoot(k));
-
         // This explicitly adds -I. to the include paths
         part->includePaths += projectDirectory();
-        part->includePaths += cbpparser.includeFiles();
-        part->defines += cbpparser.defines();
+
+        foreach (const QString &includeFile, cbpparser.includeFiles()) {
+            // CodeBlocks is utterly ignorant of frameworks on Mac, and won't report framework
+            // paths. The work-around is to check if the include path ends in ".framework", and
+            // if so, add the parent directory as framework path.
+            if (includeFile.endsWith(QLatin1String(".framework"))) {
+                const int slashIdx = includeFile.lastIndexOf(QLatin1Char('/'));
+                if (slashIdx != -1) {
+                    part->frameworkPaths += includeFile.left(slashIdx);
+                    continue;
+                }
+            }
+
+            part->includePaths += includeFile;
+        }
+
+        part->projectDefines += cbpparser.defines();
 
         CppTools::ProjectFileAdder adder(part->files);
         foreach (const QString &file, m_files)
             adder.maybeAdd(file);
 
+        part->evaluateToolchain(tc,
+                                cxxflags,
+                                cxxflags,
+                                SysRootKitInformation::sysRoot(k));
+
         pinfo.appendProjectPart(part);
         m_codeModelFuture.cancel();
         m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
@@ -453,38 +469,12 @@
     qSort(oldList.begin(), oldList.end(), sortNodesByPath);
     qSort(newList.begin(), newList.end(), sortNodesByPath);
 
-    // generate added and deleted list
-    QList<ProjectExplorer::FileNode *>::const_iterator oldIt  = oldList.constBegin();
-    QList<ProjectExplorer::FileNode *>::const_iterator oldEnd = oldList.constEnd();
-    QList<ProjectExplorer::FileNode *>::const_iterator newIt  = newList.constBegin();
-    QList<ProjectExplorer::FileNode *>::const_iterator newEnd = newList.constEnd();
-
     QList<ProjectExplorer::FileNode *> added;
     QList<ProjectExplorer::FileNode *> deleted;
 
-    while (oldIt != oldEnd && newIt != newEnd) {
-        if ( (*oldIt)->path() == (*newIt)->path()) {
-            delete *newIt;
-            ++oldIt;
-            ++newIt;
-        } else if ((*oldIt)->path() < (*newIt)->path()) {
-            deleted.append(*oldIt);
-            ++oldIt;
-        } else {
-            added.append(*newIt);
-            ++newIt;
-        }
-    }
-
-    while (oldIt != oldEnd) {
-        deleted.append(*oldIt);
-        ++oldIt;
-    }
-
-    while (newIt != newEnd) {
-        added.append(*newIt);
-        ++newIt;
-    }
+    ProjectExplorer::compareSortedLists(oldList, newList, deleted, added, sortNodesByPath);
+
+    qDeleteAll(ProjectExplorer::subtractSortedList(newList, added, sortNodesByPath));
 
     // add added nodes
     foreach (ProjectExplorer::FileNode *fn, added) {
@@ -492,18 +482,18 @@
         // Get relative path to rootNode
         QString parentDir = QFileInfo(fn->path()).absolutePath();
         ProjectExplorer::FolderNode *folder = findOrCreateFolder(rootNode, parentDir);
-        rootNode->addFileNodes(QList<ProjectExplorer::FileNode *>()<< fn, folder);
+        folder->addFileNodes(QList<ProjectExplorer::FileNode *>()<< fn);
     }
 
     // remove old file nodes and check whether folder nodes can be removed
     foreach (ProjectExplorer::FileNode *fn, deleted) {
         ProjectExplorer::FolderNode *parent = fn->parentFolderNode();
         //        qDebug()<<"removed"<<fn->path();
-        rootNode->removeFileNodes(QList<ProjectExplorer::FileNode *>() << fn, parent);
+        parent->removeFileNodes(QList<ProjectExplorer::FileNode *>() << fn);
         // Check for empty parent
         while (parent->subFolderNodes().isEmpty() && parent->fileNodes().isEmpty()) {
             ProjectExplorer::FolderNode *grandparent = parent->parentFolderNode();
-            rootNode->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent, grandparent);
+            grandparent->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent);
             parent = grandparent;
             if (parent == rootNode)
                 break;
@@ -534,7 +524,7 @@
             // No FolderNode yet, so create it
             ProjectExplorer::FolderNode *tmp = new ProjectExplorer::FolderNode(path);
             tmp->setDisplayName(part);
-            rootNode->addFolderNodes(QList<ProjectExplorer::FolderNode *>() << tmp, parent);
+            parent->addFolderNodes(QList<ProjectExplorer::FolderNode *>() << tmp);
             parent = tmp;
         }
     }
@@ -546,11 +536,6 @@
     return m_projectName;
 }
 
-Core::Id CMakeProject::id() const
-{
-    return Core::Id(Constants::CMAKEPROJECT_ID);
-}
-
 Core::IDocument *CMakeProject::document() const
 {
     return m_file;
@@ -910,7 +895,8 @@
 #if 0
     CMakeProject *project = static_cast<CMakeProject *>(m_buildConfiguration->target()->project());
     CMakeBuildInfo info(m_buildConfiguration);
-    CMakeOpenProjectWizard copw(project->projectManager(), CMakeOpenProjectWizard::ChangeDirectory,
+    CMakeOpenProjectWizard copw(Core::ICore::mainWindow(),
+                                project->projectManager(), CMakeOpenProjectWizard::ChangeDirectory,
                                 &info);
     if (copw.exec() == QDialog::Accepted) {
         project->changeBuildDirectory(m_buildConfiguration, copw.buildDirectory());

=== modified file 'src/cmakeprojectmanager/cmakeproject.h'
--- src/cmakeprojectmanager/cmakeproject.h	2014-03-03 16:19:55 +0000
+++ src/cmakeprojectmanager/cmakeproject.h	2014-06-16 10:00:33 +0000
@@ -86,7 +86,6 @@
     ~CMakeProject();
 
     QString displayName() const;
-    Core::Id id() const;
     Core::IDocument *document() const;
     CMakeManager *projectManager() const;
 

=== modified file 'src/cmakeprojectmanager/cmakeprojectmanager.h'
--- src/cmakeprojectmanager/cmakeprojectmanager.h	2014-02-28 11:28:18 +0000
+++ src/cmakeprojectmanager/cmakeprojectmanager.h	2014-06-16 10:00:33 +0000
@@ -40,20 +40,19 @@
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 
+#include <QAction>
+#include <QCheckBox>
+#include <QDir>
 #include <QFuture>
+#include <QPointer>
 #include <QStringList>
-#include <QCheckBox>
-#include <QDir>
 #include <QVector>
-#include <QAction>
 
 #include "cmakevalidator.h"
 
 QT_FORWARD_DECLARE_CLASS(QLabel)
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 
 namespace CMakeProjectManager {
 

=== modified file 'src/cmakeprojectmanager/cmakeprojectmanager.qbs'
--- src/cmakeprojectmanager/cmakeprojectmanager.qbs	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeprojectmanager.qbs	2014-06-16 10:00:33 +0000
@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 import QtcPlugin
 
@@ -6,10 +6,11 @@
     name: "CMakeProjectManager"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
-    Depends { name: "CPlusPlus" }
-    Depends { name: "Locator" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "QtSupport" }

=== modified file 'src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri'
--- src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri	2014-04-05 16:29:58 +0000
+++ src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri	2014-06-16 10:00:33 +0000
@@ -1,7 +1,10 @@
 QTC_PLUGIN_NAME = CMakeProjectManager
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
-    locator \
     projectexplorer \
     cpptools \
     texteditor \

=== modified file 'src/cmakeprojectmanager/cmakeprojectnodes.cpp'
--- src/cmakeprojectmanager/cmakeprojectnodes.cpp	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeprojectnodes.cpp	2014-06-16 10:00:33 +0000
@@ -37,16 +37,16 @@
 {
 }
 
-bool CMakeProjectNode::hasBuildTargets() const
+bool CMakeProjectNode::showInSimpleTree() const
 {
     // TODO
     return true;
 }
 
-QList<ProjectExplorer::ProjectNode::ProjectAction> CMakeProjectNode::supportedActions(Node *node) const
+QList<ProjectExplorer::ProjectAction> CMakeProjectNode::supportedActions(Node *node) const
 {
     Q_UNUSED(node);
-    return QList<ProjectAction>();
+    return QList<ProjectExplorer::ProjectAction>();
 }
 
 bool CMakeProjectNode::canAddSubProject(const QString &proFilePath) const

=== modified file 'src/cmakeprojectmanager/cmakeprojectnodes.h'
--- src/cmakeprojectmanager/cmakeprojectnodes.h	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakeprojectnodes.h	2014-06-16 10:00:33 +0000
@@ -41,8 +41,8 @@
     friend class CMakeProject;
 public:
     CMakeProjectNode(const QString &fileName);
-    virtual bool hasBuildTargets() const;
-    virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const;
+    virtual bool showInSimpleTree() const;
+    virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const;
 
     virtual bool canAddSubProject(const QString &proFilePath) const;
 

=== modified file 'src/cmakeprojectmanager/cmakeprojectplugin.cpp'
--- src/cmakeprojectmanager/cmakeprojectplugin.cpp	2014-02-25 09:40:18 +0000
+++ src/cmakeprojectmanager/cmakeprojectplugin.cpp	2014-06-16 10:00:33 +0000
@@ -90,7 +90,9 @@
     addAutoReleasedObject(new CMakeFeatureProvider);
     addAutoReleasedObject(new CMakeHighlighterFactory);
 
-    CMakeAppWizard::registerSelf();
+    addAutoReleasedObject(new ProjectExplorer::CustomWizardFactory<CMakeAppWizard>
+                              (QLatin1String("cmakeapp-project"), Core::IWizard::ProjectWizard));
+
     ProjectExplorer::KitManager::registerKitInformation(new CMakeKitInformation());
 
     return true;

=== modified file 'src/cmakeprojectmanager/cmakerunconfiguration.cpp'
--- src/cmakeprojectmanager/cmakerunconfiguration.cpp	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakerunconfiguration.cpp	2014-06-16 10:00:33 +0000
@@ -212,16 +212,6 @@
     m_arguments = newText;
 }
 
-QString CMakeRunConfiguration::dumperLibrary() const
-{
-    return QtSupport::QtKitInformation::dumperLibrary(target()->kit());
-}
-
-QStringList CMakeRunConfiguration::dumperLibraryLocations() const
-{
-    return QtSupport::QtKitInformation::dumperLibraryLocations(target()->kit());
-}
-
 void CMakeRunConfiguration::setEnabled(bool b)
 {
     if (m_enabled == b)
@@ -260,6 +250,7 @@
     m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
     m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory());
     m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory());
+    m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("CMake.WorkingDir.History"));
     ProjectExplorer::EnvironmentAspect *aspect
             = m_cmakeRunConfiguration->extraAspect<ProjectExplorer::EnvironmentAspect>();
     if (aspect) {
@@ -269,7 +260,7 @@
     m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
 
     QToolButton *resetButton = new QToolButton();
-    resetButton->setToolTip(tr("Reset to default"));
+    resetButton->setToolTip(tr("Reset to default."));
     resetButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_RESET)));
 
     QHBoxLayout *boxlayout = new QHBoxLayout();

=== modified file 'src/cmakeprojectmanager/cmakerunconfiguration.h'
--- src/cmakeprojectmanager/cmakerunconfiguration.h	2014-02-18 14:30:29 +0000
+++ src/cmakeprojectmanager/cmakerunconfiguration.h	2014-06-16 10:00:33 +0000
@@ -70,9 +70,6 @@
 
     QString title() const;
 
-    QString dumperLibrary() const;
-    QStringList dumperLibraryLocations() const;
-
     QVariantMap toMap() const;
 
     void setEnabled(bool b);

=== modified file 'src/cmakeprojectmanager/cmakesettingspage.cpp'
--- src/cmakeprojectmanager/cmakesettingspage.cpp	2014-02-28 11:28:18 +0000
+++ src/cmakeprojectmanager/cmakesettingspage.cpp	2014-06-16 10:00:33 +0000
@@ -50,7 +50,7 @@
     setDisplayName(tr("CMake"));
     setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
-       ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
+                                                   ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
     setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));
 }
 
@@ -68,22 +68,26 @@
     return Utils::Environment::systemEnvironment().searchInPath(QLatin1String("cmake"));
 }
 
-QWidget *CMakeSettingsPage::createPage(QWidget *parent)
+QWidget *CMakeSettingsPage::widget( )
 {
-    QWidget *outerWidget = new QWidget(parent);
-    QFormLayout *formLayout = new QFormLayout(outerWidget);
-    formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-    m_pathchooser = new Utils::PathChooser;
-    m_pathchooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
-    formLayout->addRow(tr("Executable:"), m_pathchooser);
-    formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
+    if (!m_widget) {
+        m_widget = new QWidget;
+        QFormLayout *formLayout = new QFormLayout(m_widget);
+        formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
+        m_pathchooser = new Utils::PathChooser;
+        m_pathchooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
+        m_pathchooser->setHistoryCompleter(QLatin1String("Cmake.Command.History"));
+        formLayout->addRow(tr("Executable:"), m_pathchooser);
+        formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
+
+        m_preferNinja = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)"));
+        formLayout->addRow(m_preferNinja);
+    }
     m_pathchooser->setPath(CMakeToolManager::userCMakePath());
 
-    m_preferNinja = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)"));
     m_preferNinja->setChecked(preferNinja());
-    formLayout->addRow(m_preferNinja);
 
-    return outerWidget;
+    return m_widget;
 }
 
 void CMakeSettingsPage::saveSettings() const
@@ -106,7 +110,7 @@
 
 void CMakeSettingsPage::finish()
 {
-
+    delete m_widget;
 }
 
 bool CMakeSettingsPage::hasCodeBlocksMsvcGenerator() const

=== modified file 'src/cmakeprojectmanager/cmakesettingspage.h'
--- src/cmakeprojectmanager/cmakesettingspage.h	2014-02-28 11:28:18 +0000
+++ src/cmakeprojectmanager/cmakesettingspage.h	2014-06-16 10:00:33 +0000
@@ -34,6 +34,7 @@
 #include <texteditor/codeassist/keywordscompletionassist.h>
 #include <utils/pathchooser.h>
 #include <QCheckBox>
+#include <QPointer>
 
 namespace CMakeProjectManager {
 namespace Internal {
@@ -46,7 +47,7 @@
     CMakeSettingsPage();
     ~CMakeSettingsPage();
 
-    QWidget *createPage(QWidget *parent);
+    QWidget *widget();
     void apply();
     void finish();
 
@@ -61,6 +62,7 @@
     void saveSettings() const;
     QString findCmakeExecutable() const;
 
+    QPointer<QWidget> m_widget;
     Utils::PathChooser *m_pathchooser;
     QCheckBox *m_preferNinja;
 };

=== modified file 'src/cmakeprojectmanager/cmaketool.cpp'
--- src/cmakeprojectmanager/cmaketool.cpp	2014-04-15 07:38:40 +0000
+++ src/cmakeprojectmanager/cmaketool.cpp	2014-06-16 10:00:33 +0000
@@ -234,9 +234,11 @@
     //add custom cmake environment vars
     addToEnvironment(env);
 
+#if 0
     qDebug()<<"Starting process: "
            <<m_executable
           <<argsStr;
+#endif
 
     m_process->setEnvironment(env);
     m_process->setCommand(m_executable, argsStr);

=== modified file 'src/cmakeprojectmanager/cmaketoolmanager.cpp'
--- src/cmakeprojectmanager/cmaketoolmanager.cpp	2014-03-12 09:06:14 +0000
+++ src/cmakeprojectmanager/cmaketoolmanager.cpp	2014-06-16 10:00:33 +0000
@@ -98,7 +98,7 @@
     if(m_instance->m_cmakeTools.contains(id.uniqueIdentifier()))
         return m_instance->m_cmakeTools[id.uniqueIdentifier()];
 
-    qDebug()<<"Don't know "<<id.toString()<<" Creating and registering it";
+    //qDebug()<<"Don't know "<<id.toString()<<" Creating and registering it";
 
     //try to find a factory that can create the cmake tool
     QList<ICMakeToolFactory*> factories = ExtensionSystem::PluginManager::getObjects<ICMakeToolFactory>();

=== modified file 'src/cmakeprojectmanager/generatorinfo.cpp'
--- src/cmakeprojectmanager/generatorinfo.cpp	2014-03-12 09:06:14 +0000
+++ src/cmakeprojectmanager/generatorinfo.cpp	2014-06-16 10:00:33 +0000
@@ -69,7 +69,8 @@
         if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) {
+                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
+                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
             return "NMake Makefiles";
         } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
             if (Utils::HostOsInfo::isWindowsHost())
@@ -101,7 +102,8 @@
         if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) {
+                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
+                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
             return tr("NMake Generator");
         } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
             if (Utils::HostOsInfo::isWindowsHost())
@@ -136,7 +138,8 @@
             if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
                     || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
                     || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) {
+                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
+                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
                 if (hasCodeBlocks)
                     results << GeneratorInfo(k);
             } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {

=== modified file 'src/cmakeprojectmanager/makestep.h'
--- src/cmakeprojectmanager/makestep.h	2014-02-28 11:42:54 +0000
+++ src/cmakeprojectmanager/makestep.h	2014-06-16 10:00:33 +0000
@@ -39,9 +39,7 @@
 class QListWidgetItem;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
 
 namespace CMakeProjectManager {
 class CMakeBuildConfiguration;