diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 09:06:43 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-27 09:06:43 (GMT) |
| commit | d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677 (patch) | |
| tree | 261ca3ad03972da54e1e4df2ef70d79015edc9aa /config.tests | |
| parent | e26f32ef8e1480f80e362059cc03c4b5a7fb92e9 (diff) | |
| parent | 001d46dffc6240da27634ef9e27b47f768587253 (diff) | |
| download | Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.zip Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.gz Qt-d17fb5cad878d1dbe144cfd7f02c6cb4d3db2677.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/opengles1/opengles1.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/opengles1cl/opengles1cl.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/opengles2/opengles2.pro | 2 | ||||
| -rw-r--r-- | config.tests/x11/xlib/xlib.cpp | 9 | ||||
| -rw-r--r-- | config.tests/x11/xlib/xlib.pro | 3 |
5 files changed, 15 insertions, 3 deletions
diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro index d800a5d..ad8dd31 100644 --- a/config.tests/unix/opengles1/opengles1.pro +++ b/config.tests/unix/opengles1/opengles1.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT diff --git a/config.tests/unix/opengles1cl/opengles1cl.pro b/config.tests/unix/opengles1cl/opengles1cl.pro index c9addf9..415cdbb 100644 --- a/config.tests/unix/opengles1cl/opengles1cl.pro +++ b/config.tests/unix/opengles1cl/opengles1cl.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro index 13f95a1..0dfae42 100644 --- a/config.tests/unix/opengles2/opengles2.pro +++ b/config.tests/unix/opengles2/opengles2.pro @@ -6,4 +6,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL +LIBS += $$QMAKE_LIBS_OPENGL_QT diff --git a/config.tests/x11/xlib/xlib.cpp b/config.tests/x11/xlib/xlib.cpp new file mode 100644 index 0000000..8d25bf5 --- /dev/null +++ b/config.tests/x11/xlib/xlib.cpp @@ -0,0 +1,9 @@ +#include <X11/Xlib.h> + +int main(int, char **) +{ + Display *d = XOpenDisplay(NULL); + XCloseDisplay(d); + return 0; +} + diff --git a/config.tests/x11/xlib/xlib.pro b/config.tests/x11/xlib/xlib.pro new file mode 100644 index 0000000..658161e --- /dev/null +++ b/config.tests/x11/xlib/xlib.pro @@ -0,0 +1,3 @@ +CONFIG += x11 +CONFIG -= qt +SOURCES = xlib.cpp |