diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt index 6df17c3dc7..450aa7bc5e 100644 --- a/android/app/CMakeLists.txt +++ b/android/app/CMakeLists.txt @@ -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() diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp index eb99933101..d5d104098f 100644 --- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp +++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp @@ -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"); } diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 792653b75b..c7034adf35 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -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