Commit Graph

271 Commits

Author SHA1 Message Date
Jonathan Liu
5b5616b63b licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4
The license agreement doesn't mention Nokia anymore after Qt was
acquired by Digia.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 18:54:38 +01:00
Khem Raj
25ad128e1f licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
* Provide the license text

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 14:48:15 +01:00
Martin Jansa
2463683ab5 qtbase-5.0.2: Fix build without -fpermissive
* commit in newer qt is using GLint and casting to GLuint
  later so it doesn't have this issue:
  commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6
  Author: Valery Volgutov <valery.volgutov@lge.com>
  Date:   Tue May 21 14:18:17 2013 -0700

    Fix FBO restoring in QOpenGLTextureGlyphCache

* but backport to 5.0.2 is using GLuint:
  and causes build failure without -fpermissive:
  | qtbase/5.0.2-r3/qtbase-opensource-src-5.0.2/src/gui/opengl/qopengltextureglyphcache.cpp:151:51: error: invalid conversion from 'GLuint* {aka unsigned int*}' to 'GLint* {aka int*}' [-fpermissive]
  |      glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
  |                                                    ^
  | /usr/include/GLES2/gl2.h:536:37: error:   initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)' [-fpermissive]
  |  GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
  |                                      ^

* resync with version from 5.1.1 to fix this

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-14 19:55:16 +01:00
florin.sarbu
13624dc95e qtwayland: Fix Project ERROR: Module v8 has no public API
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-11 05:21:21 +01:00
Martin Jansa
68772fb4ca qtlocation, qtsystems: Fix QT_MODULE_BRANCH
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-11 05:19:54 +01:00
Andre McCurdy
0713745617 qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:17:27 +01:00
Andre McCurdy
4545815d2e qtbase: configure with -openssl-linked instead of -openssl
Configure qtbase with -openssl-linked (instead of -openssl) to ensure
that run-time dependencies on libcryto and libssl are detected.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:16:50 +01:00
Andre McCurdy
59f9d8a5bc qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer
seems to be required.

Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building
qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:16:49 +01:00
Andre McCurdy
d7ebb53453 qtbase.inc: PACKAGECONFIG[gstreamer] gst-plugins-base dependency missing
When testing for GStreamer support, the qtbase 5.1.1 configure script
tries to determine pkg-config information for both gstreamer-0.10 and
gstreamer-plugins-base-0.10.

If either one is unavailable then the configure test fails (with the
slightly confusing error that gst/gst.h can't be found, even when the
gstreamer header files are present in sysroot).

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
2014-02-18 14:00:27 +01:00
Nicolas Dechesne
cefaba69a7 qtwebkit-examples: add missing RDEPENDS for qmlplugins
Some examples require qtwebkit-qmlplugins (flickerview, youtubeview),
and this dependency is not automatically added. Without this patch,
and without manually adding qtwekbit-qmlplugins, we get errors like
this:

qrc:///flickrview.qml:42:1: module "QtWebKit" is not installed

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-14 10:25:39 +01:00
Martin Jansa
7b5ad04be2 qtbase: Use bundled freetype by default
* system freetype works only together with fontconfig
* building qbasicfontdatabase fails with system freetype and without
  fontconfig or with freetype completely disabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:55:13 +02:00
Martin Jansa
d8d2421d33 qtbase: Disable freetype by default
* building qbasicfontdatabase fails without fontconfig enabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:55:13 +02:00
Martin Jansa
3af2cf3880 qtbase: Disable fontconfig by default
* it was explicitly disabled in
  commit 1b14686657
  Author: Philip Craig <phil@blackmoth.com.au>
  Date:   Wed Jun 26 02:13:02 2013 +0000
  Subject: qtbase: disable fontconfig support by default
* and then accidentaly enabled with PACKAGECONFIG changes
  commit ebdd83f6b7
  Author: Martin Jansa <Martin.Jansa@gmail.com>
  Date:   Sat Jul 20 00:02:57 2013 +0200
  Subject: qtbase: explicitly enable or disable all deps
* Thanks to Nicolas Dechesne for reporting it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-20 14:55:12 +02:00
Eric BENARD
9aeae23dfb qt5.inc: extend FILES_${PN}-examples-*
this fix :
ERROR: QA Issue: non debug package contains .debug directory: qtquick1-examples path
/work/armv7a-vfp-neon-oe-linux-gnueabi/qtquick1/5.1.1-r0/packages-split/qtquick1-examples/
usr/share/qt5/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/.debug/libqmlqtimeexampleplugin.so

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 17:56:52 +02:00
Andreas Müller
c27c56484b qtgraphicaleffects: Don't use PN in PN-dev RDEPENDS
* fix do_rootfs for images with dev-pkgs in IMAGE_FEATURES
  | Collected errors:
  |  * satisfy_dependencies_for: Cannot satisfy the following dependencies for qtgraphicaleffects-dev:
  |  *     qtgraphicaleffects (= 5.1.0-r0) *
  |  * opkg_install_cmd: Cannot install package qtgraphicaleffects-dev.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Martin Jansa
39e3e18096 qtjsondb: Remove unsupported module
* https://bugreports.qt-project.org/browse/QTBUG-31741

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Denys Dmytriyenko
0d73b7f289 qtbase.inc: PACKAGECONFIG[linuxfb] shouldn't depend on nonexistent linuxfb package
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Denys Dmytriyenko
8ef8582725 qtwebkit-examples: enable building and packaging of examples by default
Note: binaries will go into ${PN}-examples, which is qtwebkit-examples-examples

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Eric Bénard
32e0115105 qt: use 5.1.1 by default
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Eric Bénard
5525db7ee2 qtwebkit-examples: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Eric Bénard
9bc9565021 qtwebkit: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:09 +02:00
Eric Bénard
fcb52131ab qtlocation: don't depend on qtjsondb
jsondb is not listed a a dependencies on qtlocation in sync.profile
and was removed in more recent versions as qtjsondb is no more
maintained

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
632b62b022 qtquick1: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
cd3882ae32 qtsystems: don't depend on qtjsondb
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
70d3a0415d qtsensors: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
00bbe0fc70 qtscript: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
6b1e0d6776 qtmultimedia: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
42eef6a429 qtimageformats: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
8cd9e079c4 qtgraphicaleffects: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
b0a6dfba69 qtdeclarative: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
0707781359 qtxmlpatterns: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
820621cf1a qtsvg: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
99089d7ed1 qtjsbackend: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
e5d8256943 qtbase: update to 5.1.1
- patch 10 was update
- patch 19 & 25 are merged so no more needed

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:08 +02:00
Eric Bénard
a490977a26 cinematicexperience: add example
for more informations on this demo :
http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html
http://quitcoding.com/?page=work#cinex

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:49:01 +02:00
Martin Jansa
fb4277abf5 README: Add note about qtbase PACKAGECONFIG options
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-05 14:43:51 +02:00
Martin Jansa
09e9947b4c 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:43:51 +02:00
Trevor Woerner
d38371ffb8 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-05 14:43:51 +02:00
Trevor Woerner
ee726d2e14 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-05 14:43:51 +02:00
Martin Jansa
fbf33d6d9e 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-10-05 14:43:51 +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