summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2012-11-30 13:52:00 +0100
committerAndy Nichols <andy.nichols@digia.com>2012-12-03 09:50:54 +0100
commitc2651cb953c4dfcf1578a380e65d6a0ec20ca571 (patch)
treee5be70e6caafaafc7c9e93d1162d6d298d5c4775 /config.tests
parent9a8b92cc314aa84652c6da00129bb35f4a05a561 (diff)
downloadqtwayland-c2651cb953c4dfcf1578a380e65d6a0ec20ca571.tar.gz
Cleanup QtWayland module
Now that both xkbcommon 0.2.0 and libWayland 1.0.0 have been released, we should no longer be building against sha1's and should be preparing for an eventual release so these build hints have been removed. A test has been added for libWayland 1.0.0 which is required to build QtWayland. README has been updated to reflect the current situation src/3rdparty has been removed as it has not been used in some time. patches folder and contents have been removed as they are no longer needed. extensions folder has been moved to the src folder Change-Id: Iab79b5c164758a4bd0253c90f60b2a2d044e2785 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/wayland/main.cpp49
-rw-r--r--config.tests/wayland/wayland.pro12
2 files changed, 61 insertions, 0 deletions
diff --git a/config.tests/wayland/main.cpp b/config.tests/wayland/main.cpp
new file mode 100644
index 00000000..c03d8034
--- /dev/null
+++ b/config.tests/wayland/main.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia Plc and its Subsidiary(-ies) 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 <wayland-version.h>
+
+int main()
+{
+#if WAYLAND_VERSION_MAJOR < 1
+# error Wayland 1.0.0 or higher required
+#endif
+ return 0;
+} \ No newline at end of file
diff --git a/config.tests/wayland/wayland.pro b/config.tests/wayland/wayland.pro
new file mode 100644
index 00000000..5873d92d
--- /dev/null
+++ b/config.tests/wayland/wayland.pro
@@ -0,0 +1,12 @@
+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