| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
Moved duplicated and broken code for setting up the include and library
paths into the egl.prf feature file, which egl.pri and opengl.pro now
includes using the qmake feature system.
Task-number: QTBUG-5148
Reviewed-by: Tom Cooksey
|
| |
|
|
|
|
|
|
| |
Enable building egl/qegl_wince.cpp when a wince* mkspec is used
Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used
Task-number: QTBUG-5073
Reviewed-by: Trond Kjernåsen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When you link cross-compiled applications on Linux, the linker needs to
be able to find not just the libraries the application links against
(like libQtGui.so), but the libraries' dependencies. E.g.
examples/widgets/wiggly links against QtGui. QtGui links against
libEGL.so. Therefore, when you link wiggly, the linker has to be able to
find libEGL.so, even though wiggly doesn't use EGL directly.
To facilitate this, -Wl,rpath-link=/path/to/egl needs to be added to
QMAKE_PRL_LIBS in libQtGui.prl and -Wl,rpath-link=/path/to/gl needs to
be added to QMAKE_PRL_LIBS in libQtOpenGL.prl. This only needs to be
done when the EGL/GL libs are not in the default search directories. As
the paths will also change depending on the mkspec, two new variables
have been added: QMAKE_LFLAGS_EGL & QMAKE_LFLAGS_OPENGL. These can be
set in the mkspec and will be added to the relevent prls. E.g.
QMAKE_LFLAGS_EGL += -Wl,-rpath-link=$${QMAKE_LIBDIR_EGL}
QMAKE_LFLAGS_OPENGL += -Wl,-rpath-link=$${QMAKE_LIBDIR_OPENGL}
Reviewed-by: Marius Storm-Olsen
|
| |
|
|
|
|
|
|
|
|
| |
Previously, QtOpenGL assumed that by linking against QtGui, it would
automatically also be linked against EGL. However, this is no longer the
case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure
only QtGui links against EGL and not other libs/apps linking against
QtGui.
Reviewed-by: Rhys Weatherley
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On the Mac, it means "-framework ApplicationServices -framework Carbon
-framework AppKit" are no longer part of the default LIBS in Qt
applications. This required a lot of fixes where we used Mac-specific
code in Qt.
On X11, it was very straightforward, because we apparently use very
little of X11 outside QtGui.
I haven't changed the Windows-specific LIBS paths, because I don't
know how Windows behaves. Windows has DLLs, but it links to static
"import" libraries. So is it static linking or dynamic linking?
Reviewed-By: Marius Storm-Olsen
|
|
|
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
