summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qt5.inc4
-rw-r--r--recipes-qt/qt5/qtbase.inc2
-rw-r--r--recipes-qt/qt5/qtwebkit.inc2
3 files changed, 2 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index e2a16621..dfc1c767 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -3,10 +3,6 @@
3 3
4inherit qmake5 4inherit qmake5
5 5
6# Qt5 is dependent on icu for localization
7ICU = "icu "
8ICU_powerpc = "pango"
9
10PACKAGECONFIG_OPENSSL ?= "openssl" 6PACKAGECONFIG_OPENSSL ?= "openssl"
11 7
12QT_MODULE ?= "${BPN}" 8QT_MODULE ?= "${BPN}"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 378f229b..4fe6bd5e 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
116PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" 116PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
117PACKAGECONFIG[kms] = "-kms,-no-kms,kms" 117PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
118# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) 118# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
119PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" 119PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
120PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 120PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
121# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected 121# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
122PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" 122PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad0..c35504e7 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
5 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 5 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
6 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee" 6 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
7 7
8DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" 8DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
9 9
10# qtwebkit gets terribly big when linking with all debug info, disable by default 10# qtwebkit gets terribly big when linking with all debug info, disable by default
11QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" 11QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"