diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-17 18:16:41 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-18 15:39:18 +0100 |
| commit | fd6ba0e2a6fd9650d6a287ea0d55d5b97bedc8ad (patch) | |
| tree | 1846590025b27d7f122f554d96e7a92b254ccb49 /src/plugins/welcome/welcomeplugin.cpp | |
| parent | 196e0d76e638699efc20dc43f0827d8f0da173ba (diff) | |
OS X: Welcome/QQuickWidget fixes
The rendered text is still ugly, but the fuzzy text is better than the
alternative currently.
Change-Id: Id9e54fb406ee964e0b9b5c40b7a8108b45c15f85
Task-number: QTBUG-42861
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/welcome/welcomeplugin.cpp')
| -rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 2d26a2393a..ff79058a76 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 |