aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadovan Zivkovic <pivonroll@gmail.com>2013-01-21 01:08:04 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-11 19:54:52 +0100
commit3b1e5d7c793f3bf03dab03633462e570b08b3957 (patch)
tree1c85014083139b81dd05186426ac09a3784c0d60
parentef9a3e0af0f171a11632ab58e2255bde47c9476c (diff)
Table cells must not be editable.
Change-Id: I00bdee2b0d48850ecf944ca8749a979829800a88 Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
-rw-r--r--src/plugins/vcprojectmanager/msbuildparser.cpp2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/vcprojectmanager/msbuildparser.cpp b/src/plugins/vcprojectmanager/msbuildparser.cpp
index 8e10bce8b4..7a27747f66 100644
--- a/src/plugins/vcprojectmanager/msbuildparser.cpp
+++ b/src/plugins/vcprojectmanager/msbuildparser.cpp
@@ -15,7 +15,7 @@ MsBuildParser::MsBuildParser()
m_doneTargetBuildRegExp = QRegExp("Done\\sbuilding\\starget\\s\"(.*)\"\\sin\\sproject\\s\"(.*)\"(\\s--\\sFAILED)?\\.");
m_doneProjectBuildRegExp = QRegExp("Done\\sbuilding\\sproject\\s\"(.*)\"((?:\\s--\\s)FAILED)?\\.");
m_buildSucceededRegExp = QRegExp("Build succeeded\\.");
- m_buildFailedRegExp = QRegExp("(Build FAILED\\.)");
+ m_buildFailedRegExp = QRegExp("Build FAILED\\.");
m_buildTimeElapsedRegExp = QRegExp("Time\\sElapsed\\s(\\d+:\\d+:\\d+(?:\\.\\d+)?)");
m_msBuildErrorRegExp = QRegExp("MSBUILD\\s:\\s(error\\s(?:[A-Z]|[a-z]|\\d)+):\\s(.*)");
}
diff --git a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp
index 48ef7fe553..5533d58890 100644
--- a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp
@@ -164,9 +164,11 @@ bool VcProjectBuildOptionsWidget::exists(const QString &exePath)
void VcProjectBuildOptionsWidget::insertMSBuild(const MsBuildInformation &info)
{
QTableWidgetItem *exeTableItem = new QTableWidgetItem();
+ exeTableItem->setFlags(exeTableItem->flags() ^ Qt::ItemIsEditable);
exeTableItem->setText(info.m_executable);
QTableWidgetItem *versionTableItem = new QTableWidgetItem();
+ versionTableItem->setFlags(versionTableItem->flags() ^ Qt::ItemIsEditable);
versionTableItem->setText(info.m_version);
m_buildTableWidget->insertRow(m_buildTableWidget->rowCount());