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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a
This commit is contained in:
Eike Ziller
2018-02-13 13:37:37 +01:00
parent 89a6611e9e 6ffe04bc40
commit c7fdb93865
65 changed files with 654 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -29,6 +29,7 @@
#include <utils/pathchooser.h>
#include <utils/elidinglabel.h>
#include <utils/qtcassert.h>
#include <QDialogButtonBox>
#include <QLabel>
@@ -73,6 +74,7 @@ KitInformation::ItemList AndroidGdbServerKitInformation::toUserOutput(const Kit
KitConfigWidget *AndroidGdbServerKitInformation::createConfigWidget(Kit *kit) const
{
QTC_ASSERT(kit, return nullptr);
return new AndroidGdbServerKitInformationWidget(kit, this);
}
@@ -94,11 +96,13 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit)
FileName AndroidGdbServerKitInformation::gdbServer(const Kit *kit)
{
QTC_ASSERT(kit, return FileName());
return FileName::fromString(kit->value(AndroidGdbServerKitInformation::id()).toString());
}
void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbServerCommand)
{
QTC_ASSERT(kit, return);
kit->setValue(AndroidGdbServerKitInformation::id(), gdbServerCommand.toString());
}

2
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -132,7 +132,7 @@ AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(Andro
QString AndroidPackageInstallationStepWidget::summaryText() const
{
return tr("<b>Make install</b>");
return "<b>" + tr("Make install") + "</b>";
}
QString AndroidPackageInstallationStepWidget::displayName() const