rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-208 Fixing OSG/OSGE related Qt 5.6 issues.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2016-03-24 22:22:17 +01:00
parent c4e0a9ebad
commit c3c6ec4393
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
View File

@ -581,6 +581,7 @@ OSGViewport::OSGViewport(QQuickItem *parent) : QQuickFramebufferObject(parent),
{
qDebug() << "OSGViewport::OSGViewport";
// setClearBeforeRendering(false);
setMirrorVertically(true);
setAcceptHoverEvents(true);
setAcceptedMouseButtons(Qt::AllButtons);
}
@ -682,10 +683,6 @@ QSGNode *OSGViewport::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNode
qDebug() << "OSGViewport::updatePaintNode - set transform";
node = QQuickFramebufferObject::updatePaintNode(node, nodeData);
QSGSimpleTextureNode *n = static_cast<QSGSimpleTextureNode *>(node);
if (n) {
// flip Y axis
n->setTextureCoordinatesTransform(QSGSimpleTextureNode::MirrorVertically);
}
return node;
}
return QQuickFramebufferObject::updatePaintNode(node, nodeData);

6
ground/gcs/src/libs/osgearth/osgearth_dependencies.pri
View File

@ -5,7 +5,11 @@ QMAKE_CXXFLAGS += -Wno-unused-parameter
#win32:CONFIG(debug, debug|release):DS = "d"
contains(QT_ARCH, x86_64) {
LIB_DIR_NAME = lib64
macx {
LIB_DIR_NAME = lib
} else {
LIB_DIR_NAME = lib64
}
} else {
LIB_DIR_NAME = lib
}