diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-07 13:34:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-11 12:24:39 +0000 |
| commit | d07fba149ddc6df4cbc99d31b1edb17331fcfe53 (patch) | |
| tree | d7ae6370e49cc3698d49747b99c7605c780a3f11 /src/core | |
| parent | 17bc5b29783ff922c065324a2318bec3deb79cb1 (diff) | |
Fully qualify libEGL.so.1, libEGLESv2.so.2 libraries
look up the libEGL, libEGLESv2 libraries by their major version number
when loading them dynamically on embedded Linux. The libEGL.so,
libEGLESv2.so files are usually only there when development packages
are installed.
Change-Id: Ic17976506064008540201ceffa12077e1b2173f8
Task-number: QTBUG-45801
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/surface_factory_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index 40c65d9d3..db10be070 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -71,13 +71,13 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) { bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) { base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL); - libEGLPath = libEGLPath.Append("libEGL.so"); + libEGLPath = libEGLPath.Append("libEGL.so.1"); base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath); if (!eglLibrary) return false; base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2); - libGLES2Path = libGLES2Path.Append("libGLESv2.so"); + libGLES2Path = libGLES2Path.Append("libGLESv2.so.2"); base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path); if (!gles2Library) return false; |