diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-04 11:22:18 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-04 11:22:18 (GMT) |
| commit | 26ded29b31c71ff43036798015cb1c77aae427e3 (patch) | |
| tree | 24e91fe6f38e6d6d126acc9735557ddd54851547 /src | |
| parent | 47546dd3cae4cb6f1ca87621fb3752524f9d050d (diff) | |
| download | Qt-26ded29b31c71ff43036798015cb1c77aae427e3.zip Qt-26ded29b31c71ff43036798015cb1c77aae427e3.tar.gz Qt-26ded29b31c71ff43036798015cb1c77aae427e3.tar.bz2 | |
Fixed compilation and linking of EGL on Windows CE.
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/egl/egl.pri | 10 | ||||
| -rw-r--r-- | src/opengl/opengl.pro | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri index 627d511..669d311 100644 --- a/src/gui/egl/egl.pri +++ b/src/gui/egl/egl.pri @@ -1,3 +1,5 @@ +CONFIG += egl + HEADERS += \ egl/qegl_p.h \ egl/qeglproperties_p.h @@ -19,11 +21,3 @@ unix { } } } - -for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS_PRIVATE += -L$$p -} - -!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL -!isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL -!isEmpty(QMAKE_LFLAGS_EGL): LIBS += $$QMAKE_LFLAGS_EGL diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 7d6052b..deaf3bd 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -15,14 +15,7 @@ contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles1cl):CONFIG += opengles1cl contains(QT_CONFIG, opengles2):CONFIG += opengles2 - -contains(QT_CONFIG, opengles.*) { - for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS_PRIVATE += -L$$p - } - !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL - !isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL -} +contains(QT_CONFIG, egl):CONFIG += egl HEADERS += qgl.h \ qgl_p.h \ @@ -163,3 +156,4 @@ contains(QT_CONFIG,opengles1) { LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL LIBS += $$QMAKE_LFLAGS_OPENGL } + |