Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 04:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Small fixes

Browse source
This commit is contained in:
Bradley Austin Davis 2017-12-11 14:42:37 -08:00
parent a776c415eb
commit 282ae7b6f9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(TARGET_NAME native-lib)
setup_hifi_library(Gui Qml Quick)
#link_hifi_libraries(shared networking gl gpu gpu-gles image fbx render-utils physics entities octree audio midi recording controllers script-engine ui)
link_hifi_libraries(shared networking gl ui)
link_hifi_libraries(shared networking gl gpu gpu-gles image fbx render-utils physics entities octree audio midi recording controllers script-engine ui)
#link_hifi_libraries(shared networking gl ui)
target_link_libraries(native-lib android log m)
target_opengl()

2
libraries/gl/src/gl/OffscreenGLCanvas.cpp
View file

@ -52,7 +52,7 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
_offscreenSurface->setFormat(_context->format());
_offscreenSurface->create();
#if !defined(Q_OS_ANDROID)
#if defined(Q_OS_ANDROID)
if (!_context->makeCurrent(_offscreenSurface)) {
qFatal("Unable to make offscreen surface current");
}

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -2247,7 +2247,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QTimer timeout;
timeout.setSingleShot(true);
timeout.start(SANDBOX_TIMEOUT);
connect(&timeout, &QTimer::timeout, [&sandbox, scriptOrURL]{
connect(&timeout, &QTimer::timeout, [=, &sandbox]{
qCDebug(scriptengine) << "ScriptEngine::entityScriptContentAvailable timeout(" << scriptOrURL << ")";
// Guard against infinite loops and non-performant code