diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /config.tests/unix | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'config.tests/unix')
| -rw-r--r-- | config.tests/unix/opengldesktop/opengldesktop.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp index af21cfdfda..eea16b8fbd 100644 --- a/config.tests/unix/opengldesktop/opengldesktop.cpp +++ b/config.tests/unix/opengldesktop/opengldesktop.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#if defined(Q_OS_MAC) -# include <OpenGL/gl.h> +#ifdef __APPLE__ +#include <OpenGL/gl.h> #else -# include <GL/gl.h> +#include <GL/gl.h> #endif int main(int, char **) |