diff --git a/share/qtcreator/welcomescreen/widgets/NativeText.qml b/share/qtcreator/welcomescreen/widgets/NativeText.qml index f1119b8ecc1542ba2e89a6ba9a6f0d15048d9ad4..df11fe3bf360a983a1308abdaf68c8a80a62b42b 100644 --- a/share/qtcreator/welcomescreen/widgets/NativeText.qml +++ b/share/qtcreator/welcomescreen/widgets/NativeText.qml @@ -31,7 +31,7 @@ import QtQuick 2.1 Text { - renderType: Text.NativeRendering + renderType: useNativeText ? Text.NativeRendering : Text.QtRendering Accessible.name: text Accessible.role: Accessible.StaticText } diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm index 6fe80ab61ff1b1bb9b8e1bb18c8c2c6ec2633f61..7f583f145d240c7108e26bd7fe12504a5c004aae 100644 --- a/src/plugins/help/macwebkithelpviewer.mm +++ b/src/plugins/help/macwebkithelpviewer.mm @@ -415,6 +415,9 @@ MacWebKitHelpWidget::MacWebKitHelpWidget(MacWebKitHelpViewer *parent) { AutoreleasePool pool; Q_UNUSED(pool) d->m_webView = [[MyWebView alloc] init]; + // Turn layered rendering on. + // Otherwise the WebView will render empty after any QQuickWidget was shown. + d->m_webView.wantsLayer = YES; d->m_frameLoadDelegate = [[FrameLoadDelegate alloc] initWithMainFrame:d->m_webView.mainFrame viewer:parent]; [d->m_webView setFrameLoadDelegate:d->m_frameLoadDelegate]; diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 2d26a2393aa48581f8298b4fa2d3f1de2c4cf457..ff79058a767019feca0b3a442e0ad6562524687f 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -155,7 +155,6 @@ WelcomeMode::WelcomeMode() #endif // USE_QUICK_WIDGET connect(PluginManager::instance(), SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*))); - setWidget(m_modeWidget); } @@ -260,6 +259,13 @@ void WelcomeMode::initPlugins() connect(Core::ICore::instance(), &Core::ICore::themeChanged, this, &WelcomeMode::onThemeChanged); ctx->setContextProperty(QLatin1String("creatorTheme"), &m_themeProperties); +#if defined(USE_QUICK_WIDGET) + bool useNativeText = !Utils::HostOsInfo::isMacHost(); +#else + bool useNativeText = true; +#endif + ctx->setContextProperty(QLatin1String("useNativeText"), useNativeText); + QString path = resourcePath() + QLatin1String("/welcomescreen/welcomescreen.qml"); // finally, load the root page