diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 4e38da0f5c2fbbcca4d63cfea096cecea873acdf..1b34e8675bf9bd8df1a5efb2b3f963c015167aad 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -1759,7 +1759,7 @@ Sollen sie überschrieben werden?</translation> <location line="+11"/> <source>From revision %1<br/></source> <extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment> - <translation>Revision:</translation> + <translation>Revision %1<br/></translation> </message> <message> <location line="+3"/> diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index e564f6e1bb81d35eeac4475ca5976cc2009909a6..8e1a7b4b9680a1af0d7327f26e9853f88c81b222 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -1721,7 +1721,7 @@ Would you like to overwrite them?</source> <location line="+11"/> <source>From revision %1<br/></source> <extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment> - <translation>Revisión %1</translation> + <translation>Revisión %1<br/></translation> </message> <message> <location line="+3"/> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro index fe516111f6e24d37be03b3d5b24de5ab9cbacfa9..5a675d5a93675b5c1a239953813df7be2262a646 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro @@ -10,7 +10,9 @@ HEADERS = cmakeproject.h \ makestep.h \ cmakerunconfiguration.h \ cmakeopenprojectwizard.h \ - cmakebuildenvironmentwidget.h + cmakebuildenvironmentwidget.h \ + cmakeprojectwizard.h + SOURCES = cmakeproject.cpp \ cmakeprojectplugin.cpp \ cmakeprojectmanager.cpp \ @@ -18,7 +20,9 @@ SOURCES = cmakeproject.cpp \ makestep.cpp \ cmakerunconfiguration.cpp \ cmakeopenprojectwizard.cpp \ - cmakebuildenvironmentwidget.cpp + cmakebuildenvironmentwidget.cpp \ + cmakeprojectwizard.cpp + RESOURCES += cmakeproject.qrc FORMS += diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 06c52ec62c23f68629e072201ccc234b12d6cbe1..b89ac2f79427a99884acab33f4ba1e4d03fb5555 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -30,6 +30,7 @@ #include "cmakeprojectplugin.h" #include "cmakeprojectmanager.h" #include "cmakerunconfiguration.h" +#include "cmakeprojectwizard.h" #include "makestep.h" #include <coreplugin/icore.h> @@ -59,6 +60,8 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * addAutoReleasedObject(new CMakeManager(cmp)); addAutoReleasedObject(new MakeStepFactory()); addAutoReleasedObject(new CMakeRunConfigurationFactory()); + addAutoReleasedObject(new CMakeProjectWizard); + return true; }