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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
This commit is contained in:
Eike Ziller
2014-12-10 13:11:02 +01:00
parent 62b70fb239 f8a68cc69a
commit 541d00453a
71 changed files with 13040 additions and 2735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/timelinerenderer.cpp
View File

@@ -135,8 +135,8 @@ inline void TimelineRenderer::getItemXExtent(int i, int &currentX, int &itemWidt
if (rawWidth < MinimumItemWidth) {
currentX -= static_cast<int>((MinimumItemWidth - rawWidth) / 2);
itemWidth = MinimumItemWidth;
} else if (rawWidth > m_spacedDuration) {
itemWidth = static_cast<int>(m_spacedDuration);
} else if (rawWidth > m_spacedDuration - static_cast<qreal>(currentX - OutOfScreenMargin)) {
itemWidth = static_cast<int>(m_spacedDuration) - currentX + OutOfScreenMargin;
} else {
itemWidth = static_cast<int>(rawWidth);
}