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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f
This commit is contained in:
Eike Ziller
2018-10-16 07:11:57 +02:00
parent 683e7aa6cf f612833d83
commit 511bd64f3f
100 changed files with 344 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ int distance(const FileName &targetDirectory, const FileName &fileName)
// compiler flags
void CMakeCbpParser::sortFiles()
{
QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping");
QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping", QtWarningMsg);
FileNameList fileNames = transform<QList>(m_fileList, &FileNode::filePath);
sort(fileNames);

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

@@ -50,7 +50,7 @@ using namespace QtSupport;
namespace {
Q_LOGGING_CATEGORY(cmInputLog, "qtc.cmake.import");
Q_LOGGING_CATEGORY(cmInputLog, "qtc.cmake.import", QtWarningMsg);
struct CMakeToolChainData
{

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

@@ -57,7 +57,7 @@ const char HANDSHAKE_TYPE[] = "handshake";
const char START_MAGIC[] = "\n[== \"CMake Server\" ==[\n";
const char END_MAGIC[] = "\n]== \"CMake Server\" ==]\n";
Q_LOGGING_CATEGORY(cmakeServerMode, "qtc.cmake.serverMode");
Q_LOGGING_CATEGORY(cmakeServerMode, "qtc.cmake.serverMode", QtWarningMsg);
// ----------------------------------------------------------------------
// Helpers: