diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:34 +0100 |
commit | 777cdb00e704b987ad19bf842088a754cf7e6525 (patch) | |
tree | b8f2356d68e293c591c9be86113ed46478867e0b /config.tests/qpa/glx | |
parent | dc9e32caeda0278658befb8bb6e944986c021620 (diff) | |
parent | af1dbfd2239c7834187f3a702fb2029dc78d4526 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
Diffstat (limited to 'config.tests/qpa/glx')
-rw-r--r-- | config.tests/qpa/glx/glx.cpp | 52 | ||||
-rw-r--r-- | config.tests/qpa/glx/glx.pro | 10 |
2 files changed, 62 insertions, 0 deletions
diff --git a/config.tests/qpa/glx/glx.cpp b/config.tests/qpa/glx/glx.cpp new file mode 100644 index 0000000000..03af3f6131 --- /dev/null +++ b/config.tests/qpa/glx/glx.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <GL/gl.h> +#include <GL/glx.h> + +int main(int, char **) +{ + //We require glxfbconfig, ie. glx 1.3 + GLXFBConfig config; + config = 0; + + return 0; +} diff --git a/config.tests/qpa/glx/glx.pro b/config.tests/qpa/glx/glx.pro new file mode 100644 index 0000000000..da51a6d231 --- /dev/null +++ b/config.tests/qpa/glx/glx.pro @@ -0,0 +1,10 @@ +SOURCES = glx.cpp +CONFIG += x11 +INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + +for(p, QMAKE_LIBDIR_OPENGL) { + exists($$p):LIBS += -L$$p +} + +CONFIG -= qt +LIBS += -lGL |