diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-28 11:43:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-28 11:43:06 +0100 |
| commit | a546e3a9cc70ab16528320f3ff484722736ed628 (patch) | |
| tree | 7546397e89edc0c018edcd433549aa852e0c4a42 /src/libs/utils/fancymainwindow.cpp | |
| parent | fea693d9f9434c6396373fa9d97ac92893ad08c5 (diff) | |
| parent | 189ab38641d093ef1a987a985c3bbbe757118360 (diff) | |
| download | qt-creator-a546e3a9cc70ab16528320f3ff484722736ed628.tar.gz | |
Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
src/libs/utils/fancymainwindow.cpp
src/plugins/projectexplorer/msvctoolchain.cpp
Change-Id: I7aaeeb4f96c95fefd4944c083c1ddf9a19cd81d6
Diffstat (limited to 'src/libs/utils/fancymainwindow.cpp')
| -rw-r--r-- | src/libs/utils/fancymainwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index d49473beb7..dfee5df1cf 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -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); |