[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk vcl/source

[Markus Mohrhard]

 RepositoryExternal.mk              |   15 +--------------
 vcl/source/opengl/OpenGLHelper.cxx |    3 +++
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 133a5d87efe5a5088e92d285df26d5f59548d93b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Feb 27 14:50:13 2016 +0100

    remove the case for system breakpad
    
    This will be something limited to TDF builds.
    
    Change-Id: Ie7e96a33d247ea55b51563db6d42a0ff027c61e3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c61d394..39b740b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3342,8 +3342,6 @@ endif # DESKTOP
 
 ifeq ($(ENABLE_BREAKPAD),TRUE)
 
-# ifneq ($(SYSTEM_LIBBREAKPAD),TRUE)
-
 define gb_LinkTarget__use_breakpad
 $(call gb_LinkTarget_set_include,$(1),\
     -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \
@@ -3368,18 +3366,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	breakpad \
 ))
 
-# else # SYSTEM_LIBBREAKPAD
-# 
-# define gb_LinkTarget__use_libgltf
-# $(call gb_LinkTarget_set_include,$(1),\
-# 	$$(INCLUDE) \
-# 	$(LIBBREAKPAD_CFLAGS) \
-# )
-# $(call gb_LinkTarget_add_libs,$(1),$(LIBBREAKPAD_LIBS))
-#
-# endef
-
-endif # SYSTEN_LIBBREAKPAD
+endif # ENABLE_BREAKPAD
 
 ifeq ($(ENABLE_GLTF),TRUE)
 
commit 39be557968d7755a844b990388ee6acee787a024
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Feb 27 14:47:12 2016 +0100

    log to the crashreporter whether we use OpenGL
    
    Change-Id: I8fd2ffe5908074417aa5cfc00adbc54b6e9ed360

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 1ef7247..aae3cc2 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -39,6 +39,7 @@
 #include <osl/conditn.h>
 #include <vcl/opengl/OpenGLWrapper.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
+#include <desktop/crashreport.hxx>
 
 #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
 #include "opengl/x11/X11DeviceInfo.hxx"
@@ -1000,11 +1001,13 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
 
         bRet = bEnable;
     }
+
     if (bRet)
     {
         if (!getenv("SAL_DISABLE_GL_WATCHDOG"))
             OpenGLWatchdogThread::start();
     }
+    CrashReporter::AddKeyValue("UseOpenGL", OUString::boolean(bRet));
 
     return bRet;
 }