Changeset 561 for trunk/config.tests/unix/opengles1

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• config.tests/unix/opengles1/opengles1.cpp (modified) (1 diff)
• config.tests/unix/opengles1/opengles1.pro (modified) (1 diff)

trunk/config.tests/unix/opengles1/opengles1.cpp

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #include <GLES/gl.h>
-#include <GLES/egl.h>
 
 int main(int, char **)
 {
     GLfloat a = 1.0f;
-    eglInitialize(0, 0, 0);
     glColor4f(a, a, a, a);
     glClear(GL_COLOR_BUFFER_BIT);

trunk/config.tests/unix/opengles1/opengles1.pro

@@ -1 +1 @@
 SOURCES = opengles1.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
 
-for(p, QMAKE_LIBDIR_OPENGL) {
+for(p, QMAKE_LIBDIR_OPENGL) {
     exists($$p):LIBS += -L$$p
 }
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_QT
+LIBS += $$QMAKE_LIBS_OPENGL_