1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed opengldesktop configure test for mac.

Browse Source 
This configure test has never worked for mac.

In a non-qpa configuration, this didn't matter, as the configure script
would skip this configure test on mac.  The configure script could also
be modified to skip the configure test in the qpa case, but it seems
cleaner to make the test actually work.

Change-Id: I0402c490fc4c2401f6363ba2215b261f74ee5d75
Reviewed-on: http://codereview.qt.nokia.com/1127
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Rohan McGovern 2011-07-05 11:02:44 +10:00 committed by Qt by Nokia
parent 8f94aac68e
commit 45dc5852d5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.tests/unix/opengldesktop/opengldesktop.cpp
View File

@ -39,7 +39,11 @@
**
****************************************************************************/
#include <GL/gl.h>
#if defined(Q_OS_MAC)
# include <OpenGL/gl.h>
#else
# include <GL/gl.h>
#endif
int main(int, char **)
{

3
config.tests/unix/opengldesktop/opengldesktop.pro
View File

@ -7,3 +7,6 @@ for(p, QMAKE_LIBDIR_OPENGL) {
CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL
mac:DEFINES += Q_OS_MAC
CONFIG -= app_bundle