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/plugins/welcome | |
| parent | fea693d9f9434c6396373fa9d97ac92893ad08c5 (diff) | |
| parent | 189ab38641d093ef1a987a985c3bbbe757118360 (diff) | |
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/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index d60e7adf9c8..93dcec3d0e6 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -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); } |