diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-02-05 12:22:17 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-02-08 12:34:56 +0100 |
| commit | 1b39d072c2601d39354fe83dff8b1e5c05095aaf (patch) | |
| tree | 4b38960a1bcef0de376dc5441ec6372e41341801 /src/compositor/compositor.pro | |
| parent | 2e0efd201aa75121f4dd4049598f4d120811d784 (diff) | |
Qt-ify the QtCompositor module
Currently the QtCompositor library and API do not follow the Qt API
naming conventions. This commit intends to fix these inconsistencies.
filenames start with q
headers containing private API's end in _p
public API classes begin with Q
use the qt namespace macros where necessary
Wayland namespace is now QtWayland
wayland_wrapper classes are now private API's
It's important to make these changes not just for stylistic reasons, but
also because when qmake builds the module in checks for these
conventions to determine how to deploy the include files.
Change-Id: I8bfadeceda92a0f52cb73c704551da75540e7587
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/compositor/compositor.pro')
| -rw-r--r-- | src/compositor/compositor.pro | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 5ba6bc111..8a2fa01e3 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -5,5 +5,24 @@ contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL load(qt_module) -include(compositor.pri) +CONFIG += link_pkgconfig + +DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT + +!contains(QT_CONFIG, no-pkg-config) { + PKGCONFIG += wayland-server +} else { + LIBS += -lwayland-server +} + +INCLUDEPATH += ../shared +HEADERS += ../shared/qwaylandmimehelper.h +SOURCES += ../shared/qwaylandmimehelper.cpp + +include ($$PWD/global/global.pri) +include ($$PWD/wayland_wrapper/wayland_wrapper.pri) +include ($$PWD/hardware_integration/hardware_integration.pri) +include ($$PWD/compositor_api/compositor_api.pri) +include ($$PWD/windowmanagerprotocol/windowmanagerprotocol.pri) + |