Commit Graph

9 Commits

Author SHA1 Message Date
Andreas Müller 47ec6dbcba qtwayland.inc: fix QA warnings
WARNING: QA Issue: qtwayland: Files/directories were installed but not shipped
  /usr/lib/qt5/plugins/wayland-graphics-integration
  /usr/lib/qt5/plugins/wayland-graphics-integration/client
  /usr/lib/qt5/plugins/wayland-graphics-integration/server
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug/libwayland-egl.so

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Martin Jansa 4b7182a3be qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
  * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
  * SHA-1 of v5.2.1 tag is only in release branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Martin Jansa c908fe4ebd qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:01:37 +01:00
Martin Jansa c67873216b recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe
* this will make maintaining meta-qt5 a bit easier

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-13 14:57:38 +02:00
Simon Busch d68d26ba4e qtwayland: build and package examples applications too
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:40:02 +02:00
Martin Jansa 5eb22ffbfa qtwayland: add second recipe with latest SRCREV, compatible with qt5 5.1.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 886509518d qtwayland: Add xproto dependency together with libxkbcommon
* xproto provides X11/keysym.h which is used when testing libxkbcommon support:
executing config test xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && /OE/sysroots/x86_64-linux/usr/bin/qt5/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && make      MAKEFLAGS='-j 9'     OE_QMAKE_COMPILER='i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CC='i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CXX='i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types'     OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden'     OE_QMAKE_LINK='i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed'     OE_QMAKE_AR='i586-oe-linux-ar'     OE_QMAKE_STRIP='echo'     OE_QMAKE_WAYLAND_SCANNER='/OE/sysroots/x86_64-linux/usr/bin/wayland-scanner'
compiling /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp
/OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp:42:24: fatal error: X11/keysym.h: No such file or directory
compilation terminated.
make: *** [.obj/release-shared/main.o] Error 1
test xkbcommon FAILED

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 16:44:54 +02:00
Martin Jansa ae45cb478f qt5module: drop it and include only qt5.inc
* not all modules depend on qtbase, qtbase-native dependency is added
  by qmake5.bbclass:
  QT5TOOLSDEPENDS ?= "qtbase-native "
  DEPENDS_prepend = "${QT5TOOLSDEPENDS}"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 15:57:48 +02:00
Mikko Levonmaa fc0b7ec73c qtwayland: Add recipe
* Fix shader precision definition
* MJ: Fix license information
* MJ: Fix PV
* MJ: add wayland-native to depends for wayland-scaner
* MJ: add libxkbcommon to depends, but make it easy to remove it

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-06 12:21:28 +02:00