Commit Graph

241 Commits

Author SHA1 Message Date
Martin Jansa d43d777816 README: Add note about qtbase PACKAGECONFIG options
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-05 14:42:25 +02:00
Martin Jansa d6fc754ac4 qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby
* when ruby-native is reused from sstate it can contain paths pointing
  to wrong sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-05 14:42:19 +02:00
Stefan Schmidt d691c44778 maliit: Import maliit recipes from meta-oe
* Imported from rev 13ae5105ee30410136beeae66ec41ee4a8a2e2b0
  This is the first step to move these recipes over to qt5.
* maliit-framework-qt5: Build with qt5
  Switch to new github repo
  Update SRCREV and remove patches which now longer apply
  Disable doc generation and xcb
  Fix packaging
* maliit-plugins-qt5: Build with qt5.
  Switch to new github repo
  Update SRCREV and PV
  Fix packaging
* maliit-*-qt5: Adjust MKSPEC path
* meta-framework-qt5: Cleanup packaging and enable dbus activation.
  Move pkgconfig files, headers and spec files into dev.
  Cleanup packaging rules
  Enable dbus activation to start maliit server on demand
* maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host
  If not overriden here MALIIT_PLUGINS_DATA_DIR would point to some host
  paths resulting in e.g. qml files not being found.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
2013-10-05 14:42:08 +02:00
Trevor Woerner f4188229f1 devshell: include PATH for qt5 native applications
If you perform a "bitbake -c devshell <some qt5 recipe>" and then try "which
qmake" in the devshell, you'll find your host's qmake is found (which is most
likely to be based on qt4) rather than the one that is built as part of
meta-qt5. The reason for this is that the qt5 items are installed to
${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The
reason for the extra "qt5" directory at the end is so that qt4-based items
that are built in OE can live side-by-side with things from meta-qt5 without
interfering with each other.

This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH
so that the qt5-based native tools which are built as part of meta-qt5 will be
found before the host's.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-03 18:03:35 +02:00
Trevor Woerner 918d5d9671 qtwebkit: fix QA issue (bad RPATH)
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
QtWebProcess contain bad RPATHs which point into the build location. This fix
adds a patch to not include the rpath.prf which causes this problem.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-03 18:01:17 +02:00
Tasslehoff Kjappfot f11b1722e2 qtquickcontrols: Add module for 5.1.0 and git versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-17 14:49:33 +02:00
Laszlo Papp f770c5dca9 QtSerialPort: Add 5.1.0 version
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-13 14:57:38 +02: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
Martin Jansa 671313d0b5 cmake: disable test for Qt5Core
| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message):
|   The imported target "Qt5::Core" references the file
|
|      "/qmake"
|
|   but this file does not exist.  Possible reasons include:
|
|   * The file was deleted, renamed, or moved to another location.
|
|   * An install or uninstall procedure did not complete successfully.
|
|   * The installation package was faulty and contained
|
|      "tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"
|
|   but not all the files it references.
|
| Call Stack (most recent call first):
|   tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists)
|   tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:130 (include)
|   Tests/RunCMake/CMakeLists.txt:80 (find_package)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-13 14:57:24 +02:00
Bhooshan Supe 2340ce8714 qttools-native: Add module to build lrelease+lupdate+lconvert
:Release Notes:
Add optional Qt-Tools module.

:Detailed Notes:
Qt provide optional Qt-Tools like "lrelease", etc.
In absence of these tools one can not have i18n and l10n changes automated in build.
Adding "qttools-native" to "meta-qt5" Open Embedded layer provides those tools.
Using Qt-Tools i18n and l10n changes can be auomated.

:Testing Performed:

:QA Notes:

:Issues Addressed:
[GF-11028] Enable build of Qt localization tools in the Qt component

Change-Id: Ieb679249a05501a6ccb25108903a0fd48d4014f0
2013-09-13 14:32:02 +02:00
Martin Jansa 284020d934 qtwebkit: remove examples packages
* fixes:
  NOTE: multiple providers are available for runtime qtwebkit-examples (qtwebkit-examples, qtwebkit)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples
  NOTE: multiple providers are available for runtime qtwebkit-examples-dev (qtwebkit, qtwebkit-examples)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples-dev

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-13 14:07:23 +02:00
Abhijit Potnis 2868f1a183 qtwebkit-examples: Add module
Signed-off-by: Abhijit Potnis <abhijit_potnis@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-26 09:33:49 +02:00
Simon Busch 7c3a1a208d qtbase: upgrade patches for proper cmake support of native binaries at build time
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-26 09:33:49 +02:00
Martin Jansa 84c2a25417 qt5-5.1.0: Drop negative D_P
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-19 08:31:16 +02:00
Marek Belisko 2d61422b83 Fix download url for qt5-5.0.2.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-15 22:01:24 +02:00
Martin Jansa c3632023e1 qtbase: be more specific in opengl switch with gl in PACKAGECONFIG
* full GL is called desktop in qtbase configure
* without this it will try to autodetect and doesn't fail when
  e.g. mesa wasn't built before qtbase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-15 12:27:27 +02:00
Martin Jansa 54d1f81e84 Revert "qtserialport: Add module"
* incorrect LIC_FILES_CHKSUMS

This reverts commit 5b19e4bd6f.
2013-08-15 12:26:49 +02:00
Erik Botö 3529eb8055 qt5-5.0.2.inc: update path to sources
They moved the 5.0.2 sources into an archive dir upstream, this updates
the SRC_URI accordingly.

Signed-off-by: Erik Botö <erik.boto@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:43:48 +02:00
Jonathan Liu 886e8ee5bd qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:42:51 +02:00
Martin Jansa 0f7b233426 qt5-versions: Change default version to 5.1.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:42:51 +02:00
Laszlo Papp 5b19e4bd6f qtserialport: Add module
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:40:05 +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
Simon Busch ee6c2abf6a classes: cmake_qt5: export all qt5 related paths to cmake
Signed-off-by: Simon Busch <morphis@gravedo.de>
2013-08-02 11:27:25 +02:00
Simon Busch 4450a42aba qtbase: fix cmake patches to point to correct host binary directory
Signed-off-by: Simon Busch <morphis@gravedo.de>
2013-07-26 10:31:41 +02:00
Simon Busch 6b39eda7a6 classes: add new cmake_qt5 class
A cmake specific qt5 class which sets all required configuration parameters to
successfully compile cmake based applications.

Signed-off-by: Simon Busch <morphis@gravedo.de>
2013-07-25 22:33:59 +02:00
Simon Busch 243e05f1de qtbase: fix cmake files to use our host binaries
* only for qt 5.1.0; didn't had the time to port this to 5.0.2
* client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 22:33:53 +02:00
Simon Busch b0100c1b57 classes: qmake5: move QT_DIR_NAME to qmake5_paths
* qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which
  doesn't makes sense and breaks some use cases

Signed-off-by: Simon Busch <morphis@gravedo.de>
2013-07-25 20:12:14 +00:00
Martin Jansa bb4c8adeeb qtwayland: demote 5.1.0+git version a bit
* 5.0.2+git should stay default for people without qt5-versions.inc
* make sure that % isn't appended twice in qt5-versions.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 17:45:18 +02:00
Christian Gagneraud 07301a1636 qtbase.inc: Fix qtbase-tools runtime depencency on perl
* While building a custom rootfs using poky, meta-oe, meta-ti
  and meta-qt5 (all on Dylan branch), I got the following error:
  [...]
  Computing transaction...error: Can't install
    qtbase-tools-5.0.2-r2.0@armv7a_vfp_neon: no package provides /usr/bin/perl
  [...]
* syncqt is perl script with /usr/bin/perl shebang, that's why rpm
  was complaining (other package managers in OE doesn't check that)

Signed-off-by: Christian Gagneraud <chgans@gna.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:21:12 +02:00
Martin Jansa 43872948d4 qtmultimedia: add gst-plugins-base dependency and openal PACKAGECONFIG
* this will need small patch in qtmultimedia.pro to run
  qtCompileTest(openal) only with OE_OPENAL_ENABLED

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa a4c346ba8f qtwebkit: add dependency on gstreamer and libxslt
* it's autodetected from sysroot, make it deterministic
* maybe I should allow to change gst-0.10 to 1.0 without
  rewriting DEPENDS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 2649027bd0 qtimageformats: add dependency on tiff
* it's autodetected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 567a4d462f qt5: drop INC_PR and update PR only in 5.0.2 recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 3da4d425d0 qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION
* drop INC_PR/PR where possible

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +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 507c7466ea qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 902f55b957 qt5: add recipes for 5.1.0
* only rebased patches and updated SRC_URI checksum, haven't even build
  tested it yet

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa ca4a0758e1 qmake5_base: add override for HostLibraries
* qtdeclarative was using /usr/lib as HostLibraries causing
  WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used.
           Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information.
  DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib
* also without this fix qtdeclarative and qtwayland are trying to
  build tools against /usr/lib/libQt5Bootstrap.a (without sysroot
  prefix)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa ebd60ffe7e qtwayland: add native recipe
* qtwayland fails, because we'll need to add qtwayland-native to provide
  qtwaylandscanner in QT_EXTERNAL_HOST_BINS location (otherwise build
  will try to use /usr/bin/qt5/qtwaylandscanner)

* native recipe is needed to build qtwayland-scanner which
  is required after this upstream commit

  commit 05d054ad7207764293525661876ebc689940a15c
  Author: Samuel R<C3><B8>dal <samuel.rodal@digia.com>
  Date:   Tue Apr 9 16:52:59 2013 +0200
    Introduced qtwaylandscanner.

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa 71cc38affe qtjsbackend: refresh patches, move to subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa ebdd83f6b7 qtbase: explicitly enable or disable all deps
* some options are tri-state and PACKAGECONFIG doesn't support that
  if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:08 +02:00
Martin Jansa b9fec03db8 qtbase-5.0.2: refresh patches to apply cleanly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-20 14:18:37 +02:00
Eric BENARD 75291e7614 qtbase-native-5.0.2: fix compilation on Fedora 19
the patch 0017-Rename-qAbs-Function-for-timeval.patch is also
needed for native else, on Fedora 19, we get :
| ../../include/QtCore/../../../qtbase-opensource-src-5.0.2/src/corelib/global/qglobal.h:483:27: error: from previous declaration 'constexpr T qAbs(const T&) [with T = timeval]'
|  Q_DECL_CONSTEXPR inline T qAbs(const T &t) { return t >= 0 ? t : -t; }

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-08 18:02:12 +02:00
Martin Jansa b9b00aaad4 qmake5: Add trailing space in DEPENDS_prepend instead of QT5TOOLSDEPENDS
* this way it looks better in bitbake -e, instead of:
  ${QT5TOOLSDEPENDS}${BASEDEPENDS}

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:18:36 +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 28753fa6aa qtwebkit: Disable debug info by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-26 13:18:49 +02:00
Philip Craig 1b14686657 qtbase: disable fontconfig support by default
Currently fontconfig support is autodetected. It is better to be
deterministic. Since qtbase-fonts is not installed where fontconfig
will find it, it seems that current users are not using fontconfig.

Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-26 09:04:28 +02:00
Nicolas Dechesne 11ebf35b16 qtbase: typo about virtual/egl depends
The proper 'virtual' name for EGL is virtual/egl, not virtual/libegl,
as per meta/recipes-graphics/mesa/mesa-common.inc.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-20 12:39:38 +02:00
Martin Jansa e02b1ca3c2 qtdeclarative-git: Add 2 patches from 5.0.2
* 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is
  applied in newer SRCREV
* 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still
  pending

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:24:25 +02:00
Martin Jansa da60ee1856 qtdeclarative: move 5.0.2 specific patches to own directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:13:40 +02:00