summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingdong Lu <jingdong.lu@windriver.com>2011-01-19 16:19:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:01 +0000
commit811a9f7a33c3cc6b51b59ef1f15d13edeb058eef (patch)
treee72e7d06594172644acb54b449e10c0f917481ba
parent9da1e13e732313684159338279f8fb2ef8406056 (diff)
downloadpoky-811a9f7a33c3cc6b51b59ef1f15d13edeb058eef.tar.gz
qt4: Enable accessibility and sm option for LSB.
LSB library checks will look for some symbols of qt4 libraries. Enable "accessibility" and "sm" in order to pass the LSB test. Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
-rw-r--r--meta/classes/qmake2.bbclass1
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc10
3 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index 37721898d6..5eebd8ec42 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -19,5 +19,6 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
19export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" 19export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
20export OE_QMAKE_LIBS_QT = "qt" 20export OE_QMAKE_LIBS_QT = "qt"
21export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" 21export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
22export OE_QMAKE_LIBS_X11SM = "-lSM -lICE"
22export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" 23export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
23export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" 24export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
index 0a03e9b5a3..f13b94769f 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-4.6.3.inc 2require qt-4.6.3.inc
3 3
4PR = "r1" 4PR = "r2"
5 5
6QT_CONFIG_FLAGS += " -xrandr " 6QT_CONFIG_FLAGS += " -xrandr "
7 7
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 16d5bebd36..33824456ff 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -5,11 +5,15 @@ DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gst
5 5
6inherit qmake_base 6inherit qmake_base
7 7
8QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \ 8QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
9 -shared -no-nas-sound -no-sm -no-nis \ 9QT_DISTRO_FLAGS_poky-lsb = "-sm"
10
11QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
12 -shared -no-nas-sound -no-nis \
10 -qt-gif -system-libjpeg -system-libpng -system-zlib \ 13 -qt-gif -system-libjpeg -system-libpng -system-zlib \
11 -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \ 14 -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
12 -no-pch -dbus -stl -glib -phonon -webkit" 15 -no-pch -dbus -stl -glib -phonon -webkit \
16 ${QT_DISTRO_FLAGS} "
13 17
14EXTRA_OEMAKE = "-e" 18EXTRA_OEMAKE = "-e"
15 19