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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
This commit is contained in:
Tim Jenssen
2019-07-04 14:47:52 +02:00
parent 2b7fab1668 6a58666f44
commit 1df6443d4a
219 changed files with 2998 additions and 3305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/utils/synchronousprocess.cpp
View File

@@ -24,16 +24,18 @@
****************************************************************************/
#include "synchronousprocess.h"
#include "qtcassert.h"
#include "executeondestruction.h"
#include "hostosinfo.h"
#include "fileutils.h"
#include "qtcassert.h"
#include "qtcprocess.h"
#include <QDebug>
#include <QTimer>
#include <QTextCodec>
#include <QDir>
#include <QLoggingCategory>
#include <QMessageBox>
#include <QTextCodec>
#include <QThread>
#include <QTimer>
#include <QApplication>
@@ -82,6 +84,8 @@ enum { defaultMaxHangTimerCount = 10 };
namespace Utils {
Q_LOGGING_CATEGORY(processLog, "qtc.utils.synchronousprocess", QtWarningMsg);
// A special QProcess derivative allowing for terminal control.
class TerminalControllingProcess : public QProcess {
public:
@@ -445,8 +449,10 @@ static bool isGuiThread()
SynchronousProcessResponse SynchronousProcess::run(const CommandLine &cmd,
const QByteArray &writeData)
{
if (debug)
qDebug() << '>' << Q_FUNC_INFO << cmd.toUserOutput();
qCDebug(processLog).noquote() << "Starting:" << cmd.toUserOutput();
ExecuteOnDestruction logResult([this] {
qCDebug(processLog) << d->m_result;
});
d->clearForRun();
@@ -492,13 +498,16 @@ SynchronousProcessResponse SynchronousProcess::run(const CommandLine &cmd,
QApplication::restoreOverrideCursor();
}
if (debug)
qDebug() << '<' << Q_FUNC_INFO << cmd.executable().toString() << d->m_result;
return d->m_result;
}
SynchronousProcessResponse SynchronousProcess::runBlocking(const CommandLine &cmd)
{
qCDebug(processLog).noquote() << "Starting blocking:" << cmd.toUserOutput();
ExecuteOnDestruction logResult([this] {
qCDebug(processLog) << d->m_result;
});
d->clearForRun();
// On Windows, start failure is triggered immediately if the