diff options
| author | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
| commit | dd6a230f812b957137a2711c772284ee77ffccf4 (patch) | |
| tree | a1f46718a295964ddaa9ab04c8222f6db3b19057 /examples | |
| parent | f1a56f4db2f6d6c395ac6e7023b6e9184140d571 (diff) | |
| parent | eb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (diff) | |
| download | Qt-dd6a230f812b957137a2711c772284ee77ffccf4.zip Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.gz Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/hellogl_es/hellogl_es.pro | 9 | ||||
| -rw-r--r-- | examples/opengl/hellogl_es2/hellogl_es2.pro | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro index 3168743..80ef7df 100644 --- a/examples/opengl/hellogl_es/hellogl_es.pro +++ b/examples/opengl/hellogl_es/hellogl_es.pro @@ -20,15 +20,6 @@ HEADERS += bubble.h RESOURCES += texture.qrc QT += opengl -wince*:{ - contains(QT_CONFIG,opengles1) { - QMAKE_LIBS += "libGLES_CM.lib" - } - contains(QT_CONFIG,opengles1cl) { - QMAKE_LIBS += "libGLES_CL.lib" - } -} - # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index d5ad4b8..92b4224 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -25,9 +25,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 INSTALLS += target sources - - -wince*: { - QMAKE_LIBS += "libGLESv2.lib" - -}
\ No newline at end of file |