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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
This commit is contained in:
Eike Ziller
2016-05-03 11:49:01 +02:00
parent 5fa52d2ff9 9b69b789ab
commit 0f94aa3f4d
169 changed files with 4156 additions and 1867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
View File

@@ -149,40 +149,47 @@
<property name="text">
<string>Flags:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="keepGoingCheckBox">
<property name="toolTip">
<string>Keep going when errors occur (if at all possible).</string>
</property>
<property name="text">
<string>Keep going</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showCommandLinesCheckBox">
<property name="text">
<string>Show command lines</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="installCheckBox">
<property name="text">
<string>Install</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cleanInstallRootCheckBox">
<property name="text">
<string>Clean install root</string>
</property>
</widget>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="keepGoingCheckBox">
<property name="toolTip">
<string>Keep going when errors occur (if at all possible).</string>
</property>
<property name="text">
<string>Keep going</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="showCommandLinesCheckBox">
<property name="text">
<string>Show command lines</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="installCheckBox">
<property name="text">
<string>Install</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cleanInstallRootCheckBox">
<property name="text">
<string>Clean install root</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="checkBoxSpacer">
@@ -192,7 +199,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>5</height>
<height>13</height>
</size>
</property>
</spacer>

6
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -451,7 +451,7 @@ void QbsProject::updateAfterParse()
{
qCDebug(qbsPmLog) << "Updating data after parse";
rootProjectNode()->update();
updateDocuments(QSet<QString>() << projectFilePath().toString());
updateDocuments(m_qbsProject.buildSystemFiles());
updateBuildTargetData();
updateCppCodeModel();
updateQmlJsCodeModel();
@@ -935,9 +935,7 @@ void QbsProject::updateCppCompilerCallData()
}
}
m_codeModelProjectInfo.setCompilerCallData(data);
const QFuture<void> future = modelManager->updateProjectInfo(m_codeModelProjectInfo);
QTC_CHECK(future.isFinished()); // No reparse of files expected
m_codeModelProjectInfo = modelManager->updateCompilerCallDataForProject(this, data);
}
void QbsProject::updateQmlJsCodeModel()