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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Conflicts:
	src/tools/clangbackend/ipcsource/projectpart.cpp

Change-Id: I2975328ae0398f70ef4403bd6cebdc80d24379c9
This commit is contained in:
Eike Ziller
2016-08-25 12:18:57 +02:00
parent 22a5af6204 525317d5a4
commit 72991fe9f8
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/timeline/timelineitemsrenderpass.cpp
View File

@@ -144,8 +144,12 @@ float OpaqueColoredPoint2DWithSize::top() const
void OpaqueColoredPoint2DWithSize::update(float nr, float ny) void OpaqueColoredPoint2DWithSize::update(float nr, float ny)
{ {
if (a <= MaximumDirection) if (a <= MaximumDirection) {
a += MaximumDirection; a += MaximumDirection;
id = -2;
} else {
--id;
}
y += ny; y += ny;
w = nr - x; w = nr - x;

2
src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
View File

@@ -302,7 +302,7 @@ QString CompletionChunksToTextConverter::inDesiredTextFormat(const Utf8String &t
bool CompletionChunksToTextConverter::emphasizeCurrentPlaceHolder() const bool CompletionChunksToTextConverter::emphasizeCurrentPlaceHolder() const
{ {
if (m_addPlaceHolderPositions) { if (m_addPlaceHolderPositions) {
const uint currentPlaceHolderPosition = m_placeholderPositions.size() + 1; const uint currentPlaceHolderPosition = uint(m_placeholderPositions.size() + 1);
return uint(m_placeHolderPositionToEmphasize) == currentPlaceHolderPosition; return uint(m_placeHolderPositionToEmphasize) == currentPlaceHolderPosition;
} }

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

@@ -546,8 +546,6 @@ void QbsProject::changeActiveTarget(Target *t)
BuildConfiguration *bc = 0; BuildConfiguration *bc = 0;
if (t) { if (t) {
m_qbsProject = m_qbsProjects.value(t); m_qbsProject = m_qbsProjects.value(t);
if (m_qbsProject.isValid())
m_projectData = m_qbsProject.projectData();
if (t->kit()) if (t->kit())
bc = t->activeBuildConfiguration(); bc = t->activeBuildConfiguration();
} }