From dd3a30090b3379e6f075bde826f9147e4237a043 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 16 Apr 2015 13:34:18 +0200 Subject: [PATCH] Use QQuickWidget in welcome mode when compiling with Qt 5.5 or later. Several bugs were fixed in QQuickWidget, making it viable to use it by default with Qt 5.5. Change-Id: If31d2cfabf80d01b1588269a1fde96742621e995 Task-number: QTCREATORBUG-13440 Reviewed-by: Thomas Hartmann --- src/plugins/welcome/welcome.pro | 10 +++++----- src/plugins/welcome/welcomeplugin.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 250dbda65da..50ad9f9fdee 100644 --- a/src/plugins/welcome/welcome.pro +++ b/src/plugins/welcome/welcome.pro @@ -1,15 +1,15 @@ QT += quick -!isEmpty(USE_QUICK_WIDGET) { - QT += quickwidgets - DEFINES += USE_QUICK_WIDGET -} - QML_IMPORT_PATH=../../../share/qtcreator/welcomescreen include(../../qtcreatorplugin.pri) +!isEmpty(USE_QUICK_WIDGET)|minQtVersion(5, 5, 0) { + QT += quickwidgets + DEFINES += USE_QUICK_WIDGET +} + HEADERS += welcomeplugin.h SOURCES += welcomeplugin.cpp diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 651194e31ad..4ae5c96c4af 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -215,7 +215,7 @@ void WelcomeMode::facilitateQml(QQmlEngine *engine) ctx->setContextProperty(QLatin1String("creatorTheme"), &m_themeProperties); -#if defined(USE_QUICK_WIDGET) +#if defined(USE_QUICK_WIDGET) && (QT_VERSION < QT_VERSION_CHECK(5, 5, 0)) bool useNativeText = !HostOsInfo::isMacHost(); #else bool useNativeText = true;