diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-10 06:56:35 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-10 06:56:35 (GMT) |
| commit | f61ec84fc296c6f70011e30788ee511d6b6a18c6 (patch) | |
| tree | 54b3b81ac83570e65dc9b44b6756005f6ba1efde /mkspecs/linux-g++-gles2-experimental/qmake.conf | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| parent | d13418effc5f00474541ae513a30c9a42c2a1cb3 (diff) | |
| download | Qt-f61ec84fc296c6f70011e30788ee511d6b6a18c6.zip Qt-f61ec84fc296c6f70011e30788ee511d6b6a18c6.tar.gz Qt-f61ec84fc296c6f70011e30788ee511d6b6a18c6.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlineedit.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qmultiscreen/qmultiscreen.pro
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qresourceengine/tst_qresourceengine.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'mkspecs/linux-g++-gles2-experimental/qmake.conf')
| -rw-r--r-- | mkspecs/linux-g++-gles2-experimental/qmake.conf | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-gles2-experimental/qmake.conf b/mkspecs/linux-g++-gles2-experimental/qmake.conf new file mode 100644 index 0000000..9c28d17 --- /dev/null +++ b/mkspecs/linux-g++-gles2-experimental/qmake.conf @@ -0,0 +1,22 @@ +# +# Experimental qmake configuration for GLES2 +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release incremental link_prl +QT += core gui +QMAKE_INCREMENTAL_STYLE = sublib + +include(../common/g++.conf) + +QMAKE_LFLAGS += -Wl,-rpath-link=/usr/lib + +include(../common/linux.conf) + +QMAKE_LIBS_EGL = -lEGL +QMAKE_LIBS_OPENGL = -lGLESv2 +QMAKE_LIBS_OPENGL_QT = -lGLESv2 -lEGL + + +load(qt_config) |