fly/flightgear
1
0
Fork 0
Code Activity

Fix build with Qt < 5.6

Browse source
This commit is contained in:
James Turner 2017-10-09 12:15:40 +01:00
parent 2e37fabd80
commit 2d5f56a05d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/GUI/QQuickDrawable.cxx
View file

@ -268,8 +268,12 @@ void QQuickDrawable::setup(osgViewer::GraphicsWindow* gw)
d->qmlEngine->setIncubationController(d->quickWindow->incubationController()); d->qmlEngine->setIncubationController(d->quickWindow->incubationController());
d->renderControl->initialize(d->qtContext); d->renderControl->initialize(d->qtContext);
#if QT_VERSION < 0x050600
SG_LOG(SG_GUI, SG_ALERT, "Qt < 5.6 was used to build FlightGear, multi-threading of QtQuick is not safe");
#else
d->renderControl->prepareThread(op->thread()); d->renderControl->prepareThread(op->thread());
#endif
QObject::connect(d->renderControl, &QQuickRenderControl::sceneChanged, QObject::connect(d->renderControl, &QQuickRenderControl::sceneChanged,
d, &QQuickDrawablePrivate::onSceneChanged); d, &QQuickDrawablePrivate::onSceneChanged);
QObject::connect(d->renderControl, &QQuickRenderControl::renderRequested, QObject::connect(d->renderControl, &QQuickRenderControl::renderRequested,