summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-06 12:11:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 15:24:28 (GMT)
commit1e459c83e5092b6e1e7d73dce22b29c9e3138607 (patch)
tree275f4b90f22172407b7ee0646a285184f5b21540 /meta/recipes-qt
parent2e50e9b8e6b136b8b8030bc1c7780eeae5db8fc2 (diff)
downloadpoky-1e459c83e5092b6e1e7d73dce22b29c9e3138607.tar.gz
qt4: various tidy-ups
* -reduce-relocations is already specified in qt4.inc, no need to add it in qt-${PV}.inc * Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it through other inc files. * Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in qt4.inc rather than qt-${PV}.inc; these have been supported since at least 4.5.2 and therefore shouldn't be version-specific. * Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc rather than the versioned recipes for the same reason * Remove redundant setting of LICENSE in qt4-embedded.inc (From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc3
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc3
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc3
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.7.4.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc4
-rw-r--r--meta/recipes-qt/qt4/qt4.inc6
6 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 7a3ba54..8fda9ce 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -43,9 +43,6 @@ do_configure_prepend() {
43 ${S}/configure 43 ${S}/configure
44} 44}
45 45
46QT_GLFLAGS ?= ""
47QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
48
49do_compile() { 46do_compile() {
50 # Fixup missing wsegl header in some SGX SDKs 47 # Fixup missing wsegl header in some SGX SDKs
51 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then 48 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index c4f6e98..06b2432 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -1,9 +1,8 @@
1DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version." 1DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
2SECTION = "libs" 2SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
6INC_PR = "r37" 5INC_PR = "r38"
7 6
8QT_BASE_NAME ?= "qt4-embedded" 7QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 8QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index ebbee9b..8a6eb4b 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -31,7 +31,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
31 -verbose -release \ 31 -verbose -release \
32 -embedded -no-freetype -no-glib -no-iconv \ 32 -embedded -no-freetype -no-glib -no-iconv \
33 -exceptions -xmlpatterns \ 33 -exceptions -xmlpatterns \
34 -qt3support" 34 -qt3support \
35 -no-fast -silent -no-rpath"
35 36
36# yank default -e, otherwise we get the following error: 37# yank default -e, otherwise we get the following error:
37# moc_qbuffer.cpp: No such file or directory 38# moc_qbuffer.cpp: No such file or directory
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
index 3be4d73..688fb50 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
@@ -8,8 +8,6 @@ SRC_URI += "file://blacklist-diginotar-certs.diff \
8# Find the g++.conf/linux.conf in the right directory. 8# Find the g++.conf/linux.conf in the right directory.
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
11EXTRA_OECONF += " -no-fast -silent -no-rpath"
12
13TOBUILD := "src/tools/bootstrap ${TOBUILD}" 11TOBUILD := "src/tools/bootstrap ${TOBUILD}"
14 12
15SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" 13SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 029c61e..53a44ad 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,12 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r34" 8INC_PR = "r35"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
12QT_GLFLAGS_qemuppc = "-opengl" 12QT_GLFLAGS_qemuppc = "-opengl"
13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
14QT_BASE_NAME ?= "qt4" 14QT_BASE_NAME ?= "qt4"
15QT_BASE_LIB ?= "libqt" 15QT_BASE_LIB ?= "libqt"
16 16
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index bec81b4..3155cbb 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -11,12 +11,16 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm"
11 11
12QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" 12QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
13 13
14QT_GLFLAGS ?= ""
15
14QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 16QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
15 -shared -no-nas-sound -no-nis \ 17 -shared -no-nas-sound -no-nis \
16 -qt-gif -system-libjpeg -system-libpng -system-zlib \ 18 -qt-gif -system-libjpeg -system-libpng -system-zlib \
17 -no-pch -qdbus -stl -glib -phonon -webkit \ 19 -no-pch -qdbus -stl -glib -phonon -webkit \
20 -xmlpatterns -no-rpath -qt3support -silent \
18 ${QT_SQL_DRIVER_FLAGS} \ 21 ${QT_SQL_DRIVER_FLAGS} \
19 ${QT_DISTRO_FLAGS} " 22 ${QT_DISTRO_FLAGS} \
23 ${QT_GLFLAGS}"
20 24
21EXTRA_OEMAKE = "-e" 25EXTRA_OEMAKE = "-e"
22 26