feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use QQuickWidget in welcome mode when compiling with Qt 5.5 or later.

Browse Source 
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 <Thomas.Hartmann@digia.com>
This commit is contained in:
Eike Ziller
2015-04-16 13:34:18 +02:00
parent 5ba30d9278
commit dd3a30090b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/welcome/welcome.pro
View File

@@ -1,15 +1,15 @@
QT += quick QT += quick
!isEmpty(USE_QUICK_WIDGET) {
QT += quickwidgets
DEFINES += USE_QUICK_WIDGET
}
QML_IMPORT_PATH=../../../share/qtcreator/welcomescreen QML_IMPORT_PATH=../../../share/qtcreator/welcomescreen
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
!isEmpty(USE_QUICK_WIDGET)|minQtVersion(5, 5, 0) {
QT += quickwidgets
DEFINES += USE_QUICK_WIDGET
}
HEADERS += welcomeplugin.h HEADERS += welcomeplugin.h
SOURCES += welcomeplugin.cpp SOURCES += welcomeplugin.cpp

2
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -215,7 +215,7 @@ void WelcomeMode::facilitateQml(QQmlEngine *engine)
ctx->setContextProperty(QLatin1String("creatorTheme"), &m_themeProperties); 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(); bool useNativeText = !HostOsInfo::isMacHost();
#else #else
bool useNativeText = true; bool useNativeText = true;