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/ios/iosbuildsettingswidget.cpp
View File

@@ -47,7 +47,7 @@ namespace Ios {
namespace Internal {
namespace {
Q_LOGGING_CATEGORY(iosSettingsLog, "qtc.ios.common")
Q_LOGGING_CATEGORY(iosSettingsLog, "qtc.ios.common", QtWarningMsg)
}
static const int IdentifierRole = Qt::UserRole+1;

4
src/plugins/ios/iosconfigurations.cpp
View File

@@ -71,8 +71,8 @@ using namespace Utils;
using namespace Debugger;
namespace {
Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup")
Q_LOGGING_CATEGORY(iosCommonLog, "qtc.ios.common")
Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup", QtWarningMsg)
Q_LOGGING_CATEGORY(iosCommonLog, "qtc.ios.common", QtWarningMsg)
}
using ToolChainPair = std::pair<ClangToolChain *, ClangToolChain *>;

2
src/plugins/ios/iosdevice.cpp
View File

@@ -49,7 +49,7 @@
using namespace ProjectExplorer;
namespace {
Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect")
Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg)
}
#ifdef Q_OS_MAC

2
src/plugins/ios/iosplugin.cpp
View File

@@ -53,7 +53,7 @@ using namespace QtSupport;
namespace Ios {
namespace Internal {
Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common")
Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common", QtWarningMsg)
class IosPluginPrivate
{

2
src/plugins/ios/iosprobe.cpp
View File

@@ -33,7 +33,7 @@
#include <QLoggingCategory>
#include <QProcess>
static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe")
static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe", QtWarningMsg)
namespace Ios {

2
src/plugins/ios/iostoolhandler.cpp
View File

@@ -58,7 +58,7 @@
#include <string.h>
#include <errno.h>
static Q_LOGGING_CATEGORY(toolHandlerLog, "qtc.ios.toolhandler")
static Q_LOGGING_CATEGORY(toolHandlerLog, "qtc.ios.toolhandler", QtWarningMsg)
namespace Ios {

2
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -47,7 +47,7 @@
using namespace std;
namespace {
Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator")
Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg)
}
namespace Ios {

2
src/plugins/ios/simulatoroperationdialog.cpp
View File

@@ -34,7 +34,7 @@
#include <QPushButton>
namespace {
Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common")
Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg)
}
namespace Ios {