summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb2
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
4 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
index 5fe7bc98bd..e7e4b3c62a 100644
--- a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "qt4-x11-free"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4qtm_embedded := "" 4qtm_embedded := ""
5qtm_dir = "qt4" 5qtm_dir = "qt4"
6qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} " 6qtm_glflags := "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
7qtm_extra_config := "" 7qtm_extra_config := ""
8 8
9inherit qt4x11 9inherit qt4x11
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index ff63d2b0d0..d46acb9c7e 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,8 +1,8 @@
1HOMEPAGE = "http://qt-project.org/" 1HOMEPAGE = "http://qt-project.org/"
2DEPENDS = "gstreamer util-linux" 2DEPENDS = "gstreamer util-linux"
3 3
4PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 4PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
5 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 5 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
6PACKAGECONFIG[bluetooth] = ",,bluez4" 6PACKAGECONFIG[bluetooth] = ",,bluez4"
7PACKAGECONFIG[pulseaudio] = ",,pulseaudio" 7PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
8 8
@@ -65,12 +65,12 @@ maemo5-contacts_enabled = no
65maemo5-calendar_enabled = no 65maemo5-calendar_enabled = no
66maemo6-landmarks_enabled = no 66maemo6-landmarks_enabled = no
67bme_enabled = no 67bme_enabled = no
68bluez_enabled = ${@base_contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} 68bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)}
69proj_enabled = no 69proj_enabled = no
70gstreamer-photography_enabled = no 70gstreamer-photography_enabled = no
71gstreamer-appsrc_enabled = yes 71gstreamer-appsrc_enabled = yes
72blkid_enabled = yes 72blkid_enabled = yes
73pulseaudio_enabled = ${@base_contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)} 73pulseaudio_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}
74udev_enabled = yes 74udev_enabled = yes
75iphb_enabled = no 75iphb_enabled = no
76nfc_symbian_enabled = no 76nfc_symbian_enabled = no
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 73ed2bcbd9..3b1e0fecad 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -10,7 +10,7 @@ QT4DEPENDS = ""
10 10
11INC_PR = "r50" 11INC_PR = "r50"
12 12
13QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 13QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
14QT_GLFLAGS_qemux86 = "-opengl" 14QT_GLFLAGS_qemux86 = "-opengl"
15QT_GLFLAGS_qemuppc = "-opengl" 15QT_GLFLAGS_qemuppc = "-opengl"
16QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle" 16QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 9a10138e94..0023f16a6c 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,7 +1,7 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"
4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 4DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5 5
6require qt4_arch.inc 6require qt4_arch.inc
7 7
@@ -18,7 +18,7 @@ QT_XML ?= "-xmlpatterns"
18QT_WEBKIT ?= "-webkit" 18QT_WEBKIT ?= "-webkit"
19QT_PHONON ?= "-phonon" 19QT_PHONON ?= "-phonon"
20QT_DBUS ?= "-qdbus" 20QT_DBUS ?= "-qdbus"
21QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" 21QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
22 22
23QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 23QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
24 -shared -no-nas-sound -no-nis \ 24 -shared -no-nas-sound -no-nis \