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

7
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -53,7 +53,6 @@
#include <QHeaderView>
#include <QLabel>
#include <QMouseEvent>
#include <QOpenGLWidget>
#include <QPainter>
#include <QScrollArea>
#include <QStackedWidget>
@@ -352,12 +351,6 @@ WelcomeMode::WelcomeMode()
layout->addWidget(new StyledBar(m_modeWidget));
layout->addItem(hbox);
if (Utils::HostOsInfo::isMacHost()) { // workaround QTBUG-61384
auto openglWidget = new QOpenGLWidget;
openglWidget->hide();
layout->addWidget(openglWidget);
}
setWidget(m_modeWidget);
}