diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-11-03 15:14:47 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-23 06:50:34 +0000 |
commit | 1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 (patch) | |
tree | 12206741f269aef8d45a8f8165919347dd359d0d /config.tests | |
parent | c445cf7d4e517248013e707a5050f9e0408a2746 (diff) | |
download | qtwayland-1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37.tar.gz |
Move qtwayland over to use the new configuration system
Re-use configuration results from qtbase where possible and move
all pkg-config handling over to be done at configuration time.
Since waylandclient and waylandcompositor are two independent libs,
this required some duplication of features and libraries used by
both in the configure.json files.
Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/brcm_egl/brcm_egl.pro | 13 | ||||
-rw-r--r-- | config.tests/brcm_egl/main.cpp | 71 | ||||
-rw-r--r-- | config.tests/drm_egl_server/drm_egl_server.pro | 13 | ||||
-rw-r--r-- | config.tests/glx/glx.pro | 13 | ||||
-rw-r--r-- | config.tests/libhybris_egl_server/libhybris_egl_server.pro | 13 | ||||
-rw-r--r-- | config.tests/wayland/wayland.pro | 13 | ||||
-rw-r--r-- | config.tests/wayland_cursor/wayland_cursor.pro | 11 | ||||
-rw-r--r-- | config.tests/wayland_egl/wayland_egl.pro | 14 | ||||
-rw-r--r-- | config.tests/wayland_scanner/wayland_scanner.pro | 7 | ||||
-rw-r--r-- | config.tests/xcomposite/xcomposite.pro | 13 | ||||
-rw-r--r-- | config.tests/xkbcommon/main.cpp | 67 | ||||
-rw-r--r-- | config.tests/xkbcommon/xkbcommon.pro | 12 |
12 files changed, 1 insertions, 259 deletions
diff --git a/config.tests/brcm_egl/brcm_egl.pro b/config.tests/brcm_egl/brcm_egl.pro deleted file mode 100644 index a6b416f1..00000000 --- a/config.tests/brcm_egl/brcm_egl.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = brcm_egl -CONFIG -= qt - -INCLUDEPATH += $$QMAKE_INCDIR_EGL - -for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p -} - -LIBS += $$QMAKE_LIBS_EGL - -# Input -SOURCES += main.cpp diff --git a/config.tests/brcm_egl/main.cpp b/config.tests/brcm_egl/main.cpp deleted file mode 100644 index bb3cab73..00000000 --- a/config.tests/brcm_egl/main.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <stdio.h> - -#include <EGL/egl.h> -#include <EGL/eglext.h> - -#include <EGL/eglext_brcm.h> - -int main() -{ - EGLDisplay display = eglGetDisplay((EGLNativeDisplayType)EGL_DEFAULT_DISPLAY); - if (!display) { - fprintf(stderr, "No EGL display"); - return -1; - } - - EGLint major, minor; - if (!eglInitialize(display, &major, &minor)) { - fprintf(stderr, "Failed to initialize EGL"); - return -1; - } - - EGLint pixel_format = EGL_PIXEL_FORMAT_ARGB_8888_BRCM; - - EGLint id[2]; - PFNEGLCREATEGLOBALIMAGEBRCMPROC createImage = (PFNEGLCREATEGLOBALIMAGEBRCMPROC)eglGetProcAddress("eglCreateGlobalImageBRCM"); - createImage(32, 32, pixel_format, 0, 32 * 4, id); - - eglTerminate(display); - - return 0; -} diff --git a/config.tests/drm_egl_server/drm_egl_server.pro b/config.tests/drm_egl_server/drm_egl_server.pro index 328354eb..28dcadcb 100644 --- a/config.tests/drm_egl_server/drm_egl_server.pro +++ b/config.tests/drm_egl_server/drm_egl_server.pro @@ -1,14 +1 @@ -TARGET = drm_egl_server -QT = core - -!contains(QT_CONFIG, opengl): error("drm_egl_server support requires Qt configured with OpenGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += egl -} else { - LIBS += -legl -} - -# Input SOURCES += main.cpp diff --git a/config.tests/glx/glx.pro b/config.tests/glx/glx.pro index 74cc6083..28dcadcb 100644 --- a/config.tests/glx/glx.pro +++ b/config.tests/glx/glx.pro @@ -1,14 +1 @@ -TARGET = glx -QT = core - -!contains(QT_CONFIG, opengl): error("glx support requires Qt configured with OpenGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += x11 gl -} else { - LIBS += -lX11 -lGL -} - -# Input SOURCES += main.cpp diff --git a/config.tests/libhybris_egl_server/libhybris_egl_server.pro b/config.tests/libhybris_egl_server/libhybris_egl_server.pro index bc358d55..28dcadcb 100644 --- a/config.tests/libhybris_egl_server/libhybris_egl_server.pro +++ b/config.tests/libhybris_egl_server/libhybris_egl_server.pro @@ -1,14 +1 @@ -TARGET = libhybris_egl_server -QT = core - -!contains(QT_CONFIG, opengl): error("libhybris_egl_server support requires Qt configured with OpenGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += egl -} else { - LIBS += -legl -} - -# Input SOURCES += main.cpp diff --git a/config.tests/wayland/wayland.pro b/config.tests/wayland/wayland.pro index 5873d92d..28dcadcb 100644 --- a/config.tests/wayland/wayland.pro +++ b/config.tests/wayland/wayland.pro @@ -1,12 +1 @@ -TARGET = wayland -QT = core - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-client -} else { - LIBS += -lwayland-client -} - -# Input -SOURCES += main.cpp
\ No newline at end of file +SOURCES += main.cpp diff --git a/config.tests/wayland_cursor/wayland_cursor.pro b/config.tests/wayland_cursor/wayland_cursor.pro index aa38d32f..28dcadcb 100644 --- a/config.tests/wayland_cursor/wayland_cursor.pro +++ b/config.tests/wayland_cursor/wayland_cursor.pro @@ -1,12 +1 @@ -TARGET = wayland_cursor -QT = core - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-cursor -} else { - LIBS += -lwayland-cursor -} - -# Input SOURCES += main.cpp diff --git a/config.tests/wayland_egl/wayland_egl.pro b/config.tests/wayland_egl/wayland_egl.pro index 42d6b131..28dcadcb 100644 --- a/config.tests/wayland_egl/wayland_egl.pro +++ b/config.tests/wayland_egl/wayland_egl.pro @@ -1,15 +1 @@ -TARGET = wayland_egl -QT = core - -!contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL") -!contains(QT_CONFIG, egl): error("wayland_egl support requires Qt configured with EGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-egl -} else { - LIBS += -lwayland-egl -} - -# Input SOURCES += main.cpp diff --git a/config.tests/wayland_scanner/wayland_scanner.pro b/config.tests/wayland_scanner/wayland_scanner.pro index 300e439e..03da69dc 100644 --- a/config.tests/wayland_scanner/wayland_scanner.pro +++ b/config.tests/wayland_scanner/wayland_scanner.pro @@ -2,13 +2,6 @@ TARGET = wayland_scanner isEmpty(QMAKE_WAYLAND_SCANNER):error("QMAKE_WAYLAND_SCANNER not defined for this mkspec") -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-client -} else { - LIBS += -lwayland-client -} - # Input SOURCES += main.cpp diff --git a/config.tests/xcomposite/xcomposite.pro b/config.tests/xcomposite/xcomposite.pro index 6838970a..28dcadcb 100644 --- a/config.tests/xcomposite/xcomposite.pro +++ b/config.tests/xcomposite/xcomposite.pro @@ -1,14 +1 @@ -TARGET = xcomposite -QT = core - -!contains(QT_CONFIG, opengl): error("xcomposite support requires Qt configured with OpenGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += xcomposite -} else { - LIBS += -lXcomposite -} - -# Input SOURCES += main.cpp diff --git a/config.tests/xkbcommon/main.cpp b/config.tests/xkbcommon/main.cpp deleted file mode 100644 index 97162f3d..00000000 --- a/config.tests/xkbcommon/main.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <xkbcommon/xkbcommon.h> -#include <xkbcommon/xkbcommon-keysyms.h> -#include <string.h> - -int main() -{ - xkb_rule_names names; - names.rules = strdup("evdev"); - names.model = strdup("pc105"); - names.layout = strdup("us"); - names.variant = strdup(""); - names.options = strdup(""); - - xkb_context *context = xkb_context_new(xkb_context_flags(0)); - if (context) { - xkb_keymap * keymap = xkb_map_new_from_names(context, &names, xkb_map_compile_flags(0)); - if (keymap) { - xkb_state *state = xkb_state_new(keymap); - if (state) - xkb_state_unref(state); - xkb_map_unref(keymap); - } - xkb_context_unref(context); - } - - return 0; -} diff --git a/config.tests/xkbcommon/xkbcommon.pro b/config.tests/xkbcommon/xkbcommon.pro deleted file mode 100644 index af6668bc..00000000 --- a/config.tests/xkbcommon/xkbcommon.pro +++ /dev/null @@ -1,12 +0,0 @@ -TARGET = xkbcommon -QT = core - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += xkbcommon -} else { - LIBS += -lxkbcommon -} - -# Input -SOURCES += main.cpp |