Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Nichols committed Dec 3, 2012
1 parent 9a8b92c commit c2651cb
Show file tree
Hide file tree
Showing 39 changed files with 99 additions and 2,182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -11,6 +11,7 @@ config.tests/glx/glx
config.tests/wayland_egl/wayland_egl
config.tests/xcomposite/xcomposite
config.tests/xkbcommon/xkbcommon
config.tests/wayland/wayland
qrc_*.cpp
moc_*.cpp
.obj/
Expand Down
16 changes: 14 additions & 2 deletions README
@@ -1,5 +1,17 @@
This is the Qt for Wayland module.
This is the QtWayland module.

The QtWayland module consists of two parts:

Wayland platform plugin:
Enables Qt applications to be run as Wayland clients.

QtCompositor API:
Enables the creation of Wayland compositors using Qt and QtQuick.

To build the QtWayland module you need the external dependencies:
xkbcommon 0.2.0 - http://xkbcommon.org/
libwayland 1.0.1 - http://wayland.freedesktop.org/

Sometimes we are slightly behind upstream wayland, so if your compiling Wayland from git, reset to sha1 defined in wayland_sha1.txt

We hang out at #qt-labs and #qt-lighthouse on freenode if you have any questions

49 changes: 49 additions & 0 deletions 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;
}
12 changes: 12 additions & 0 deletions 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
7 changes: 0 additions & 7 deletions libxkbcommon_sha1.txt

This file was deleted.

254 changes: 0 additions & 254 deletions patches/0001-Add-thread-affinity-to-wayland-clients.patch

This file was deleted.

8 changes: 0 additions & 8 deletions patches/README

This file was deleted.

5 changes: 5 additions & 0 deletions qtwayland.pro
@@ -1,4 +1,5 @@
load(configure)
qtCompileTest(wayland)
qtCompileTest(xkbcommon)
qtCompileTest(brcm_egl)
qtCompileTest(egl)
Expand All @@ -7,3 +8,7 @@ qtCompileTest(wayland_egl)
qtCompileTest(xcomposite)

load(qt_parts)

!config_wayland {
error(QtWayland requires Wayland 1.0.0 or higher)
}

0 comments on commit c2651cb

Please sign in to comment.