rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

Merged in filnet/librepilot (pull request #175)

Browse Source 
couple of hotfixes
This commit is contained in:
Philippe Renon 2016-02-14 11:35:24 +01:00
commit b978556899
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/src/app/main.cpp
View File

@ -266,12 +266,14 @@ void systemInit()
// TODO revisit this...
QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
#ifdef Q_OS_WIN
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
// see https://doc-snapshots.qt.io/qt5-5.6/highdpi.html
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
#else
// see http://doc.qt.io/qt-5/highdpi.html
qputenv("QT_DEVICE_PIXEL_RATIO", "auto");
#endif
#endif
// Force "basic" render loop

13
make/3rdparty/osgearth/osg-3.5.1.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/include/osgViewer/View b/include/osgViewer/View
index 472b489..07ef9ce 100644
--- a/include/osgViewer/View
+++ b/include/osgViewer/View
@@ -127,7 +127,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
/** Set the View's image pager.*/
void setImagePager(osgDB::ImagePager* ip);
- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); }
+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); }
/** Get the View's image pager.*/
osgDB::ImagePager* getImagePager();