Make Creator compile without QtQuick module being present

This is an unsupported configuration for testing only.

Change-Id: Idf5dde8210e0599806a3374a964adfd192b60149
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2017-02-10 21:50:37 +01:00
parent eb579dec4f
commit bce765aaa9
4 changed files with 26 additions and 7 deletions

View File

@@ -14,10 +14,14 @@ SUBDIRS = \
qmleditorwidgets \ qmleditorwidgets \
glsl \ glsl \
ssh \ ssh \
timeline \
sqlite \ sqlite \
clangbackendipc \ clangbackendipc
flamegraph
qtHaveModule(quick) {
SUBDIRS += \
flamegraph \
timeline
}
for(l, SUBDIRS) { for(l, SUBDIRS) {
QTC_LIB_DEPENDS = QTC_LIB_DEPENDS =

View File

@@ -82,9 +82,14 @@ void HostOsInfo::unsetOverrideFileNameCaseSensitivity()
bool HostOsInfo::canCreateOpenGLContext(QString *errorMessage) bool HostOsInfo::canCreateOpenGLContext(QString *errorMessage)
{ {
#ifdef QT_NO_OPENGL
Q_UNUSED(errorMessage)
return false;
#else
static const bool canCreate = QOpenGLContext().create(); static const bool canCreate = QOpenGLContext().create();
if (!canCreate) if (!canCreate)
*errorMessage = QApplication::translate("Utils::HostOsInfo", *errorMessage = QApplication::translate("Utils::HostOsInfo",
"Cannot create OpenGL context."); "Cannot create OpenGL context.");
return canCreate; return canCreate;
#endif
} }

View File

@@ -52,11 +52,16 @@ SUBDIRS = \
modeleditor \ modeleditor \
qmakeandroidsupport \ qmakeandroidsupport \
winrt \ winrt \
qmlprofiler \
updateinfo \ updateinfo \
scxmleditor \ scxmleditor \
welcome welcome
qtHaveModule(quick) {
SUBDIRS += qmlprofiler
} else {
warning("QmlProfiler plugin has been disabled since the Qt Quick module is not available.")
}
qtHaveModule(help) { qtHaveModule(help) {
SUBDIRS += help SUBDIRS += help
} else { } else {
@@ -70,10 +75,14 @@ qtHaveModule(designercomponents_private) {
} }
DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER) DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER)
isEmpty(DO_NOT_BUILD_QMLDESIGNER) { isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick) {
SUBDIRS += qmldesigner SUBDIRS += qmldesigner
} else { } else {
warning("QmlDesigner plugin has been disabled.") !qtHaveModule(quick) {
warning("QmlDesigner plugin has been disabled since the Qt Quick module is not available.")
} else {
warning("QmlDesigner plugin has been disabled since DO_NOT_BUILD_QMLDESIGNER is set.")
}
} }

View File

@@ -5,9 +5,10 @@ SUBDIRS = qtpromaker \
sdktool \ sdktool \
valgrindfake \ valgrindfake \
3rdparty \ 3rdparty \
qml2puppet \
buildoutputparser buildoutputparser
qtHaveModule(quick): SUBDIRS += qml2puppet
win32 { win32 {
SUBDIRS += qtcdebugger \ SUBDIRS += qtcdebugger \
wininterrupt \ wininterrupt \