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

Merge remote-tracking branch 'origin/4.10' into 4.11

Browse Source 
Conflicts:
	src/libs/utils/fancymainwindow.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I7aaeeb4f96c95fefd4944c083c1ddf9a19cd81d6
This commit is contained in:
Eike Ziller
2019-10-28 11:43:06 +01:00
parent fea693d9f9 189ab38641
commit a546e3a9cc
8 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/fancymainwindow.cpp
View File

@@ -182,7 +182,6 @@ public:
m_maximumActiveSize = QSize(maxWidth, activeHeight);
auto layout = new QHBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
layout->setContentsMargins(4, 0, 0, 0);
layout->addWidget(m_titleLabel);