From f7808af946d13d97731ada3b1e3e6e73143a233c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Oct 2019 15:42:28 +0200 Subject: [PATCH 1/9] Update qbs submodule To HEAD of 1.14 branch. Change-Id: I3106078a808ddddc0211d46e871c66383746aec3 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index aec975a3f95..665db9c9dd9 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit aec975a3f95f905b2d63ea1500ace28eddea7b9e +Subproject commit 665db9c9dd9ced277eebe7dce0f908dc2cb0825b From 418c7d108ac2324d1a10c7f769618eecae01f399 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 14 Oct 2019 09:54:28 +0200 Subject: [PATCH 2/9] AutoTest: Fix handling of parameterized boost tests Setting the parameterized flag after the test case may have been added to the found tests is useless. Do it as early as possible to take it into account when gathering information for location and type. Beside this the filter for parameterized boost tests had been wrong which in turn led to not executing them at all. Change-Id: I1a4345b2a751c79cc4fc6df8e201e9606c961aaf Reviewed-by: David Schulz --- src/plugins/autotest/boost/boostcodeparser.cpp | 3 +-- src/plugins/autotest/boost/boosttesttreeitem.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/autotest/boost/boostcodeparser.cpp b/src/plugins/autotest/boost/boostcodeparser.cpp index 79c612285b1..526bbf13889 100644 --- a/src/plugins/autotest/boost/boostcodeparser.cpp +++ b/src/plugins/autotest/boost/boostcodeparser.cpp @@ -105,6 +105,7 @@ void BoostCodeParser::handleIdentifier() } else if (identifier == "BOOST_TEST_CASE") { handleTestCase(TestCaseType::Functions); } else if (identifier == "BOOST_PARAM_TEST_CASE") { + m_currentState.setFlag(BoostTestTreeItem::Parameterized); handleTestCase(TestCaseType::Parameter); } else if (identifier == "BOOST_AUTO_TEST_CASE") { handleTestCase(TestCaseType::Auto); @@ -203,8 +204,6 @@ void BoostCodeParser::handleTestCase(TestCaseType testCaseType) m_currentState = BoostTestTreeItem::Enabled; return; } - if (testCaseType == TestCaseType::Parameter) - m_currentState |= BoostTestTreeItem::Parameterized; } else if (m_currentState.testFlag(BoostTestTreeItem::Fixture)) { // ignore first parameter (fixture) and first comma if (!skipCommentsUntil(T_IDENTIFIER)) diff --git a/src/plugins/autotest/boost/boosttesttreeitem.cpp b/src/plugins/autotest/boost/boosttesttreeitem.cpp index e2e58c28aff..556546f6a44 100644 --- a/src/plugins/autotest/boost/boosttesttreeitem.cpp +++ b/src/plugins/autotest/boost/boosttesttreeitem.cpp @@ -236,6 +236,8 @@ QList BoostTestTreeItem::getSelectedTestConfigurations() co QString tcName = item->name(); if (item->state().testFlag(BoostTestTreeItem::Templated)) tcName.append("<*"); + else if (item->state().testFlag(BoostTestTreeItem::Parameterized)) + tcName.append('*'); tcName = handleSpecialFunctionNames(tcName); testCasesForProjectFile[item->proFile()].testCases.append( item->prependWithParentsSuitePaths(tcName)); @@ -271,6 +273,8 @@ TestConfiguration *BoostTestTreeItem::testConfiguration() const QString tcName = handleSpecialFunctionNames(boostItem->name()); if (boostItem->type() == TestSuite) // execute everything below a suite tcName.append("/*"); + else if (boostItem->state().testFlag(BoostTestTreeItem::Parameterized)) + tcName.append('*'); else if (boostItem->state().testFlag(BoostTestTreeItem::Templated)) tcName.append("<*"); testCases.append(boostItem->prependWithParentsSuitePaths(tcName)); @@ -281,6 +285,8 @@ TestConfiguration *BoostTestTreeItem::testConfiguration() const QString tcName = name(); if (state().testFlag(BoostTestTreeItem::Templated)) tcName.append("<*"); + else if (state().testFlag(BoostTestTreeItem::Parameterized)) + tcName.append('*'); testCases.append(prependWithParentsSuitePaths(handleSpecialFunctionNames(tcName))); } From cc1399a4b672aa4b9679b1febff3c8c762842612 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 17 Oct 2019 14:10:32 +0200 Subject: [PATCH 3/9] Debugger: Fix crash after breakpoint marker drag&drop The updateMarker function deletes the marker of the global breakpoint so don't call that function from the marker. Fixes: QTCREATORBUG-23107 Change-Id: I377608f1a08b61451be1fc0be5bc15252252a4a7 Reviewed-by: hjk --- src/plugins/debugger/breakhandler.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 8befb49f8e0..4beee1d5a64 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -170,7 +170,6 @@ public: // the next line that generated code. m_gbp->m_params.lineNumber = lineNumber; - m_gbp->updateMarker(); m_gbp->update(); } @@ -186,14 +185,11 @@ public: void dragToLine(int line) final { + TextMark::move(line); QTC_ASSERT(m_gbp, return); QTC_ASSERT(BreakpointManager::globalBreakpoints().contains(m_gbp), return); - BreakpointParameters params = m_gbp->m_params; - params.lineNumber = line; - GlobalBreakpoint gbp = m_gbp; - m_gbp = GlobalBreakpoint(); - gbp->deleteBreakpoint(); - m_gbp = BreakpointManager::createBreakpoint(params); + m_gbp->m_params.lineNumber = line; + m_gbp->update(); } bool isClickable() const final { return true; } From fa8ff4108f646e6f3d9a3b8d4b59abd1a299ae10 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 17 Oct 2019 14:35:25 +0200 Subject: [PATCH 4/9] Debugger: further untangle of breakpoint item and marker Change-Id: I9331912c1b53a0110479f46ef1e576676441ab75 Reviewed-by: hjk --- src/plugins/debugger/breakhandler.cpp | 21 +++++++++++++++------ src/plugins/debugger/breakhandler.h | 1 - 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 4beee1d5a64..22fd4a4008d 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -169,16 +169,14 @@ public: // running, as this can be triggered by moving the breakpoint to // the next line that generated code. - m_gbp->m_params.lineNumber = lineNumber; - m_gbp->update(); + m_gbp->updateLineNumber(lineNumber); } void updateFileName(const FilePath &fileName) final { TextMark::updateFileName(fileName); QTC_ASSERT(m_gbp, return); - m_gbp->m_params.fileName = fileName.toString(); - m_gbp->update(); + m_gbp->updateFileName(fileName); } bool isDraggable() const final { return true; } @@ -188,8 +186,7 @@ public: TextMark::move(line); QTC_ASSERT(m_gbp, return); QTC_ASSERT(BreakpointManager::globalBreakpoints().contains(m_gbp), return); - m_gbp->m_params.lineNumber = line; - m_gbp->update(); + m_gbp->updateLineNumber(line); } bool isClickable() const final { return true; } @@ -2261,6 +2258,18 @@ void GlobalBreakpointItem::removeBreakpointFromModel() theBreakpointManager->destroyItem(this); } +void GlobalBreakpointItem::updateLineNumber(int lineNumber) +{ + m_params.lineNumber = lineNumber; + update(); +} + +void GlobalBreakpointItem::updateFileName(const FilePath &fileName) +{ + m_params.fileName = fileName.toString(); + update(); +} + QString GlobalBreakpointItem::markerFileName() const { // Some heuristics to find a "good" file name. diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 83d934034b6..fa7434657f3 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -93,7 +93,6 @@ private: friend class BreakHandler; friend class BreakpointManager; friend class BreakpointMarker; - friend class GlobalBreakpointMarker; void updateMarker(); void updateMarkerIcon(); From b9b2d5ef5d3366b67aef797a4c07d508ddb034b0 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 1 Oct 2019 10:32:53 +0200 Subject: [PATCH 5/9] Remove extra setMargin(..) Some lines after we can see a setContentsMargins Change-Id: I376129566c7df466a3413f001b42c670ee7c7022 Reviewed-by: hjk --- src/libs/qmleditorwidgets/contextpanewidget.cpp | 1 - src/libs/qmleditorwidgets/contextpanewidgetimage.cpp | 1 - src/libs/utils/fancymainwindow.cpp | 1 - src/plugins/bineditor/bineditorplugin.cpp | 1 - src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp | 1 - 5 files changed, 5 deletions(-) diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index d09902be1b5..d628ae5eed2 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -158,7 +158,6 @@ void DragWidget::enterEvent(QEvent *) ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_currentWidget(0) { QGridLayout *layout = new QGridLayout(this); - layout->setMargin(0); layout->setContentsMargins(1, 1, 1, 1); layout->setSpacing(0); m_toolButton = new QToolButton(this); diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index dcc3e9ecc66..abe974ee5c4 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -884,7 +884,6 @@ PreviewDialog::PreviewDialog(QWidget *parent) : DragWidget(parent) QVBoxLayout *layout = new QVBoxLayout(this); QHBoxLayout *horizontalLayout = new QHBoxLayout(); QHBoxLayout *horizontalLayout2 = new QHBoxLayout(); - layout->setMargin(0); layout->setContentsMargins(2, 2, 2, 16); layout->setSpacing(4); QToolButton *toolButton = new QToolButton(this); diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 9a5c84894c3..5398218789c 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->setMargin(0); layout->setSpacing(0); layout->setContentsMargins(4, 0, 0, 0); layout->addWidget(m_titleLabel); diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 9fbba5c7f85..b6bc79d23ad 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -368,7 +368,6 @@ public: auto l = new QHBoxLayout; auto w = new QWidget; - l->setMargin(0); l->setContentsMargins(0, 0, 5, 0); l->addStretch(1); l->addWidget(m_addressEdit); diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index 8fd25083154..627299c64e7 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -637,7 +637,6 @@ ClangEditorDocumentProcessor::creatorForHeaderErrorDiagnosticWidget( return [firstHeaderErrorDiagnostic]() { auto vbox = new QVBoxLayout; - vbox->setMargin(0); vbox->setContentsMargins(10, 0, 0, 2); vbox->setSpacing(2); From 383ea95889d7f841ebe5047572861febf65f0450 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 17 Oct 2019 14:46:26 +0200 Subject: [PATCH 6/9] Debugger: Avoid recreation of breakpoint markers Change-Id: Ie3b160a7b7137257b2028d03878700675142102f Reviewed-by: hjk --- src/plugins/debugger/breakhandler.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 22fd4a4008d..63b03189bed 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -2260,13 +2260,18 @@ void GlobalBreakpointItem::removeBreakpointFromModel() void GlobalBreakpointItem::updateLineNumber(int lineNumber) { + if (m_params.lineNumber == lineNumber) + return; m_params.lineNumber = lineNumber; update(); } void GlobalBreakpointItem::updateFileName(const FilePath &fileName) { - m_params.fileName = fileName.toString(); + const QString &file = fileName.toString(); + if (m_params.fileName == file) + return; + m_params.fileName = file; update(); } @@ -2305,11 +2310,14 @@ void GlobalBreakpointItem::updateMarker() const FilePath file = FilePath::fromString(m_params.fileName); const int line = m_params.lineNumber; - if (m_marker && (file != m_marker->fileName() || line != m_marker->lineNumber())) - destroyMarker(); - - if (!m_marker && !file.isEmpty() && line > 0) + if (m_marker) { + if (file != m_marker->fileName()) + m_marker->updateFileName(file); + if (line != m_marker->lineNumber()) + m_marker->move(line); + } else if (!file.isEmpty() && line > 0) { m_marker = new GlobalBreakpointMarker(this, file, line); + } if (m_marker) m_marker->setToolTip(toolTip()); From 8c7dd57645ab30f760846f7cbf57121d763d8473 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 2 Oct 2019 09:28:43 +0200 Subject: [PATCH 7/9] Clang: Build against LLVM/Clang 9 Task-numer: QTCREATORBUG-23038 Change-Id: I3608bca6541614bb55e67d35c87334957cd02761 Reviewed-by: Cristian Adam Reviewed-by: Konstantin Tokarev (cherry picked from commit 6ec8017bc675692f3d325c0cd95c9c4c7a79db7d) Reviewed-by: Orgad Shaneh --- src/plugins/clangformat/clangformatutils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 59c2b592d78..f087f77a948 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -60,7 +60,11 @@ static clang::format::FormatStyle qtcStyle() style.AllowShortBlocksOnASingleLine = false; style.AllowShortCaseLabelsOnASingleLine = false; style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; +#if LLVM_VERSION_MAJOR >= 9 + style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; +#else style.AllowShortIfStatementsOnASingleLine = false; +#endif style.AllowShortLoopsOnASingleLine = false; style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; style.AlwaysBreakBeforeMultilineStrings = false; From 708179285de9f58e8578b72f7320c37b6252c45f Mon Sep 17 00:00:00 2001 From: Alexis Murzeau Date: Mon, 14 Oct 2019 23:52:16 +0200 Subject: [PATCH 8/9] MsvcToolchain: Fix "detection" of supported ABIs for msvc2010 Always ensure that supportedAbis includes targetAbi so toolchains that don't have any vcvars32.bat or the like (like msvc2010) are restored correctly at startup. The cache-miss case is just shifted inside a else clause so the added code is executed both in case of cache hit or miss. The targetAbi is added to m_supportedAbis but is not cached in abiCache as the abiCache has only vcVarsBat as the key, which is the same for all toolchains of the same compiler but different architecture. This way, even if the common supportedAbis is retrieved from the cache, the presence of targetAbi is always checked and added if needed. With this modification to detectInstalledAbis(), setSupportedAbi is not needed anymore as it is redundant. Now msvc2015 build tools case is handled the same way as msvc2010 in detectInstalledAbis(). This effectively reverts 2896e5f5e289a30928ab679c99d7de68d4a903ac. Also, the existing QTC_ASSERT(m_supportedAbis.isEmpty(), return); in detectInstalledAbis() is removed as when vcVars is changed, it can have a new uncached vcVarsBase while having supportedAbis set already (via a call to changeVcVarsCall). This happens for clang-cl toolchains that inherit MsvcToolchain but change vcVarsBat in ClangClToolChain::resetMsvcToolChain later (in ClangClToolChain::detectClangClToolChainInPath). Task-number: QTCREATORBUG-22960 Change-Id: Iaad5ea1dc649393037a3d32faa9075153974b5cb Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/msvctoolchain.cpp | 72 ++++++++++--------- src/plugins/projectexplorer/msvctoolchain.h | 2 - 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 17bf393a4c1..39f9d8ea8a0 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -776,39 +776,51 @@ void MsvcToolChain::updateEnvironmentModifications(QList void MsvcToolChain::detectInstalledAbis() { - if (!m_supportedAbis.isEmpty()) // Build Tools 2015 - return; static QMap abiCache; const QString vcVarsBase = QDir::fromNativeSeparators(m_vcvarsBat).left(m_vcvarsBat.lastIndexOf('/')); if (abiCache.contains(vcVarsBase)) { m_supportedAbis = abiCache.value(vcVarsBase); - return; + } else { + // Clear previously detected m_supportedAbis to repopulate it. + m_supportedAbis.clear(); + const Abi baseAbi = targetAbi(); + for (MsvcPlatform platform : platforms) { + bool toolchainInstalled = false; + QString perhapsVcVarsPath = vcVarsBase + QLatin1Char('/') + QLatin1String(platform.bat); + const Platform p = platform.platform; + if (QFileInfo(perhapsVcVarsPath).isFile()) { + toolchainInstalled = true; + } else { + // MSVC 2015 and below had various versions of vcvars scripts in subfolders. Try these + // as fallbacks. + perhapsVcVarsPath = vcVarsBase + platform.prefix + QLatin1Char('/') + + QLatin1String(platform.bat); + toolchainInstalled = QFileInfo(perhapsVcVarsPath).isFile(); + } + if (hostSupportsPlatform(platform.platform) && toolchainInstalled) { + Abi newAbi(archForPlatform(p), + baseAbi.os(), + baseAbi.osFlavor(), + baseAbi.binaryFormat(), + wordWidthForPlatform(p)); + if (!m_supportedAbis.contains(newAbi)) + m_supportedAbis.append(newAbi); + } + } + + abiCache.insert(vcVarsBase, m_supportedAbis); } - QTC_ASSERT(m_supportedAbis.isEmpty(), return); - const Abi baseAbi = targetAbi(); - for (MsvcPlatform platform : platforms) { - bool toolchainInstalled = false; - QString perhapsVcVarsPath = vcVarsBase + QLatin1Char('/') + QLatin1String(platform.bat); - const Platform p = platform.platform; - if (QFileInfo(perhapsVcVarsPath).isFile()) { - toolchainInstalled = true; - } else { - // MSVC 2015 and below had various versions of vcvars scripts in subfolders. Try these - // as fallbacks. - perhapsVcVarsPath = vcVarsBase + platform.prefix + QLatin1Char('/') - + QLatin1String(platform.bat); - toolchainInstalled = QFileInfo(perhapsVcVarsPath).isFile(); - } - if (hostSupportsPlatform(platform.platform) && toolchainInstalled) { - Abi newAbi(archForPlatform(p), baseAbi.os(), baseAbi.osFlavor(), baseAbi.binaryFormat(), - wordWidthForPlatform(p)); - if (!m_supportedAbis.contains(newAbi)) - m_supportedAbis.append(newAbi); - } - } - abiCache.insert(vcVarsBase, m_supportedAbis); + // Always add targetAbi in supportedAbis if it is empty. + // targetAbi is the abi with which the toolchain was detected. + // This is necessary for toolchains that don't have vcvars32.bat and the like in their + // vcVarsBase path, like msvc2010. + // Also, don't include that one in abiCache to avoid polluting it with values specific + // to one toolchain as the cache is global for a vcVarsBase path. For this reason, the + // targetAbi needs to be added manually. + if (m_supportedAbis.empty()) + m_supportedAbis.append(targetAbi()); } Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environment &env) const @@ -1284,13 +1296,6 @@ void MsvcToolChain::changeVcVarsCall(const QString &varsBat, const QString &vars } } -void MsvcToolChain::setSupportedAbi(const Abi &abi) -{ - // Hack for Build Tools 2015 only. - QTC_CHECK(m_supportedAbis.isEmpty()); - m_supportedAbis = { abi }; -} - // -------------------------------------------------------------------------- // MsvcBasedToolChainConfigWidget: Creates a simple GUI without error label // to display name and varsBat. Derived classes should add the error label and @@ -1909,7 +1914,6 @@ static void detectCppBuildTools2015(QList *list) QLatin1String(e.varsBatArg)); tc->setDetection(ToolChain::AutoDetection); tc->setLanguage(language); - tc->setSupportedAbi(abi); list->append(tc); } } diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 63d3e865529..bc0adb00bae 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -98,8 +98,6 @@ public: void setVarsBatArg(const QString &varsBA) { m_varsBatArg = varsBA; } void changeVcVarsCall(const QString &varsBat, const QString &varsBatArgs = QString()); - void setSupportedAbi(const Abi &abi); - bool operator==(const ToolChain &) const override; bool isJobCountSupported() const override { return false; } From 189ab38641d093ef1a987a985c3bbbe757118360 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 17 Oct 2019 10:54:12 +0200 Subject: [PATCH 9/9] macOS: Remove workaround for bug that was fixed in Qt 5.9.2 Removing the dummy OpenGL widget gets rid of flicker and scaling issues when moving between monitors with different DPI. Fixes: QTCREATORBUG-23064 Change-Id: I2373862244353b545e8756afe294f9beeefda422 Reviewed-by: Christian Stenger --- src/plugins/welcome/welcomeplugin.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 88a8a1ace4a..0b54b19b467 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -353,12 +352,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); }