feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

app_version.h: Make IDE name configurable

Browse Source 
Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2017-08-29 11:48:48 +02:00
committed by Eike Ziller
parent ca959d8063
commit 4ef01c961e
72 changed files with 233 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -194,8 +194,8 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps)
CMakeTool *tool = CMakeKitInformation::cmakeTool(target()->kit());
if (!tool || !tool->isValid()) {
emit addTask(Task(Task::Error,
tr("Qt Creator needs a CMake Tool set up to build. "
"Configure a CMake Tool in the kit options."),
tr("A CMake tool must be set up for building. "
"Configure a CMake tool in the kit options."),
Utils::FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
canInit = false;

4
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -29,6 +29,7 @@
#include "cmaketoolmanager.h"
#include "cmaketool.h"
#include <app/app_version.h>
#include <projectexplorer/task.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/kit.h>
@@ -383,7 +384,8 @@ QList<Task> CMakeGeneratorKitInformation::validate(const Kit *k) const
if (!tool->hasServerMode() && info.extraGenerator != "CodeBlocks") {
result << Task(Task::Warning, tr("The selected CMake binary has no server-mode and the CMake "
"generator does not generate a CodeBlocks file. "
"Qt Creator will not be able to parse CMake projects."),
"%1 will not be able to parse CMake projects.")
.arg(Core::Constants::IDE_DISPLAY_NAME),
Utils::FileName(), -1, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
}

2
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -157,7 +157,7 @@ void ServerModeReader::resetData()
void ServerModeReader::parse(bool force)
{
emit configurationStarted();
Core::MessageManager::write(tr("Starting to parse CMake project for Qt Creator."));
Core::MessageManager::write(tr("Starting to parse CMake project."));
QTC_ASSERT(m_cmakeServer, return);
QVariantMap extra;