Commit Graph

401 Commits

Author SHA1 Message Date
Martin Jansa
02861e677a qttools: fix noqtwebkit option
* it's added to CONFIG variable not QT_CONFIG

* qtwebkit was still detected and linked against
  DEBUG: qttools-tools: Dependency libQt5WebKitWidgets.so.5 requires
  package qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
   'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])

  DEBUG: qttools-tools: Dependency libQt5WebKit.so.5 requires package
  qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant'])

  DEBUG: qttools-plugins: Dependency libQt5WebKitWidgets.so.5 requires
  package qtwebkit (used by files:
  ['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
   'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-08-11 13:37:28 +02:00
Martin Jansa
5d28f84257 qtwebkit.inc: add PACKAGECONFIG for libwebp
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-08-11 13:37:28 +02:00
Martin Jansa
b0a32232e7 qtimageformats: Make the dependencies deterministic
* jasper and libwebp were autodetected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-08-04 19:20:39 +02:00
Yen-Chin Lee
6ce50bf97b cinematicexperience: fix qt5.3 compatibility
cinematicexperience will run failed on Qt5.3.0 and Qt5.3.1, error message
as below

------------------------------------------------------------
Qt5_CinematicExperience.qml:26:5: Type MainView unavailable
         MainView {
         ^
/content/MainView.qml:241:9: Type SettingsView unavailable
             SettingsView {
             ^
/content/SettingsView.qml:88:13: Type Switch unavailable
                 Switch {
                 ^
/content/Switch.qml:9:21: Cannot assign a value to a signal (expecting a script to be run)
         property string onText: "On"

                         ^
------------------------------------------------------------

This patch fix this issue and make cinematicexperience can run on qt5.3.

ref: http://wickwire2099.blogspot.tw/2014/05/qt-530-qt5-cinematic-experience.html

Signed-off-by: Yen-Chin Lee <coldnew.tw@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-23 16:35:52 +02:00
Martin Jansa
5111e23ae2 qtbase: restore QOpenGLPaintDevice-sub-area-support.patch from 5.3.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-22 22:24:26 +02:00
Jonathan Liu
0c5abb6ae5 qtbase: fix 0003-Add-external-hostbindir-option.patch
The isEmpty function takes a variable name instead of a value.
As $$[QT_EXTERNAL_HOST_BINS] is a built-in we need to assign it to a
variable to check if it is empty.

If QT_EXTERNAL_HOST_BINS is empty (as is the case for generated Qt 5
toolchains), we need to fallback to QT_HOST_BINS when determining
the path for tools such as moc otherwise you get the following error
when building a Qt project using the generated toolchain:
make[1]: /moc: Command not found

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-10 15:42:33 +02:00
Otavio Salvador
41ed13fbb5 tufao: Add recipe
Tufão is an asynchronous web framework for C++ built on top of Qt
inspired in Node.js.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-10 15:42:28 +02:00
Neena Busireddy
7f5c022e8c qt5-demo-extrafiles: Create recipe to include extrafiles for qt5 demo.
This recipe has all the extra files required for Qt5 demo.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:46 +02:00
Neena Busireddy
1d046542b6 quitindicators: Create recipe to demonstrate qt5 example.
This example shows the implementation of QUITIndicators components.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:46 +02:00
Neena Busireddy
723530340e quitbattery: Create recipe to demonstrate qt5 example.
This example demonstrates how QUItBattery could behave
in different situations.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Neena Busireddy
96fb1cadc5 qt5nmapper: Create recipe to demonstrate qt5 example.
NMapper is a small application to experiment with normal mapping on Qt5.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Neena Busireddy
ed02fe97c5 qt5nmapcarousedemo: Create recipe to demonstrate qt5 example.
Qt5 Nmapcarousel demonstrates the normal mapping technique using Qt5

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Neena Busireddy
74925c7347 qt5ledscreen: Create recipe to demonstrate qt5 example.
This is demonstration of simple LedScreen Component utilizing Qt5 QML.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Neena Busireddy
655f71d341 qtsmarthome: Create recipe to demonstrate qt5 example.
This is the Smarthome QML demo application showing interface
to control an automated house.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Neena Busireddy
164f9aa413 qt5everywheredemo: Create recipe to demonstrate qt5 example.
Qt5 Everywhere Demo provides a quick tour of Qt 5.0, primarily
focusing on its graphical capabilities.

This recipe originated from the wandboard wiki page
http://wiki.wandboard.org/index.php/Integrate_Qt5_into_yocto_sato_image_on_Wandboard

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Martin Jansa
9f802b01e5 qtmultimedia: Add gstremer-1.0 support
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Martin Jansa
26b7fee65a qtwebengine: Add 2 more patches to fix do_configure and fix QA warning
* otherwise moc generated files have the same basename and do_configure fails with:
  core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
  |   javascript_dialog_controller: javascript_dialog_controller.cpp
  | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
  ...

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Simon Busch
0663bcdddf qtwebengine: add initial recipe for git version only
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:45 +02:00
Simon Busch
a608ef4d63 ninja-native: add recipe
Needed to build qtwebengine. Taken from meta-browser.

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:44 +02:00
Martin Jansa
5909942005 qtbase: fix 0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
* again resolves this kind of warnings:
  WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host
    include and/or library paths were used. Please check the log
    '/OE/qtxmlpatterns/5.3.1-r0/temp/log.do_compile'
    for more information.
2014-07-06 19:45:44 +02:00
Martin Jansa
b26453cd28 recipes: upgrade from 5.3.0 to 5.3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:44 +02:00
Martin Jansa
0d9ca1b1bd recipes-git: upgrade to latest SRCREV in stable branch
* this will be close to 5.3.1 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-25 16:03:00 +02:00
Andreas Müller
82dbbfe81e qttools: make qtwebkit a PACKAGECONFIG and disable by default
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-25 16:02:18 +02:00
Martin Jansa
aa8588a72e qtwayland: respect OE_QMAKE_PATH_QT_HEADERS and use QT_VERSION variable
* QT_VERSION allows to use 5.3.1 e.g. when overriding SRCREV
* ${includedir}/${QT_DIR_NAME} is the default value of OE_QMAKE_PATH_QT_HEADERS, but
  when it's changed by user we should respect it here

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-13 13:44:45 +02:00
Martin Jansa
890d699834 qtwayland: Don't use bashisms in do_install
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 13:04:01 +02:00
Martin Jansa
32b4764e91 maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
b4e270f9e2 qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
06c25e6a6b qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5
* move more patches to "shared" section

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
96c33dfbed recipes-git: Use LIC_FILES_CHKSUM from .inc files
* the old checksum was introduced in .inc files in upgrade of
  tarball recipes to 5.3.0, use that until it's updated in
  git recipes and then we'll have to move old checksum from .inc
  to release recipe only.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
cf2c7816fd recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
a0da57e5ce packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
28e4936d70 qtenginio: Add new module
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
e47180cf1f qtwebsockets: Add new module
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Jonathan Liu
e9ad98bbed qt5: upgrade from 5.2.1 to 5.3.0
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Martin Jansa
6374736f37 recipes-git: Upgrade from latest origin/release to latest origin/stable
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
  should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
  5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
  * 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
    was upstreamed in:
    0c3301f configure: make pulseaudio and alsa configurable options
  * 0005-qt_module-Fix-pkgconfig-replacement.patch
    is hopefully resolved in:
    eaefbe3 snuff -L/-I with system paths when installing meta files
    a33afed de-duplicate setup of libdir replacement in prl files
    aa20e7f reshuffle code for clarity
    ee86ce8 don't attempt to replace include paths in meta files
    but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
  * only year was updated:
    - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
    + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
  * new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
    in qtbase-native, disable qtpaths as well

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Otavio Salvador
9957ec5d01 qt5.inc: Fix packaging of plugins
The qtmultimedia module install the plugins in a sub-directory however
those were not being packaged. This patch fixes following QA error:

ERROR: QA Issue: qtmultimedia: Files/directories were installed but not shipped
  /usr/lib/qt5/plugins/video
  /usr/lib/qt5/plugins/video/videonode
  /usr/lib/qt5/plugins/video/videonode/libimx6vivantevideonode.so
  /usr/lib/qt5/plugins/video/videonode/.debug
  /usr/lib/qt5/plugins/video/videonode/.debug/libimx6vivantevideonode.so

Reported-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-06-06 13:37:29 -03:00
Andreas Müller
ed05b91f13 qtwayland: install created private headers, v2
* I've accidentaly merged v1 of this patch, so this is just
  missing part from PATCHv2.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 14:40:10 +02:00
Andreas Müller
790d43aae5 qtwayland: install created private headers
buildhistory diff:

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Andreas Müller
925fcf4ecf qtwayland-native: make qtwayland find qtwaylandscanner
bindir/qt5 causes not building QtWaylandClient files.
See [1] for further explanation. This error was discoverd by building
hawaii-shell failing with:

| /home/superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlinputdevice_p.h:56:58: fatal error: QtCompositor/private/qwayland
|  #include <QtCompositor/private/qwayland-server-wayland.h>
|                                                           ^
| compilation terminated.

[1] 0e1ce36ae6

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Andreas Müller
bb39cdb7cc qtwayland: move to latest revision
latest hawaii has moved to frame-sync support

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Thomas Senyk
8259586022 qtbase.inc: add -no-xkbcommon
If one builds with xkb, both -no-xkb and
-no-xkbcommon should be set.
Without -no-xkbcommon you'll get link-errors
for libcomposeplatforminputcontextplugin.so

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-30 12:48:07 +02:00
Otavio Salvador
48311c05e2 qtsystems: Remove examples.pro file from packages
The examples.pro file is useless as we don't deploy the
source code. Remove it from the packages.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Otavio Salvador
6302f02403 qtbase: Remove examples.pro file from packages
The examples.pro file is useless as we don't deploy the
source code. Remove it from the packages.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Otavio Salvador
7dd1fcdecb packagegroup-qt5-toolchain-target: Don't require qtquickcontrols-qmlplugins
The qtquickcontrols-qmlplugins requirement has been move to a runtime
recommendation so we don't fail in case it is not available.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Jacob Kroon
05ed65d225 populate_sdk_qt5.bbclass: Fix PACKAGE_GROUP deprecation warning
Fixes the following warning:

WARNING: PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES instead

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:23 +02:00
Martin Jansa
381717aa35 qtbase: add xcb-util-renderutil to xcb PACKAGECONFIG
* also force xcb-xlib and system-xcb just for consistency (configure script
  will disable xcb-xlib when compile-test fails)
* fixes test-dependencies issue:
  qtbase/qtbase-plugins/latest lost dependency on  libxcb-render xcb-util-renderutil

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Andreas Oberritter
6b1ad9ef45 qtbase: xinput2 depends on libxi
| ../../../../qtbase-opensource-src-5.2.1/config.tests/x11/xinput2/xinput2.cpp:43:36: fatal error: X11/extensions/XInput2.h: No such file or directory
|  #include <X11/extensions/XInput2.h>
|                                     ^
| compilation terminated.
| make: *** [xinput2.o] Error 1
| XInput2 disabled.
| XInput2 support cannot be enabled due to functionality tests!

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Andreas Oberritter
3d2eca97d6 qtbase: enable xkb by default if x11 is in DISTRO_FEATURES
Fixes "Error: -no-xkbcommon is not supported on XCB platform plugin."

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Martin Jansa
17f240dfa9 cmake: remove .bbappends, resolved in oe-core
* it's included in daisy and master branches
  http://git.openembedded.org/openembedded-core/commit/?h=daisy&id=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00
Jonathan Liu
12a40b8412 qtlocation: add packageconfig for geoclue and gypsy
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-05-09 14:40:09 +02:00