summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:42:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commit89386fde895a585c6322fc94b594c35a355555e7 (patch)
tree3cb1a250f94db918c84cf5ce2a5c995cfad9b74d /meta
parentaea363afaa193feee774dad30d81c516ea4a98fc (diff)
downloadpoky-89386fde895a585c6322fc94b594c35a355555e7.tar.gz
qt4: PR bumps
* sofar only formal changes, but to test that everything still builds the same (From OE-Core rev: 054a0e6c850f92c03fbb6314702de4e6318ccd25) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools.inc2
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 23308536ec..1199a8ab76 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5LICENSE = "LGPLv2.1 | GPLv3" 5LICENSE = "LGPLv2.1 | GPLv3"
6 6
7INC_PR = "r11" 7INC_PR = "r12"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
10 10
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 3dc12af70a..777863006e 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -17,7 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
17SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 17SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
18SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 18SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
19 19
20PR = "r6" 20PR = "r7"
21 21
22S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" 22S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
23 23
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 53eb652b08..c060634233 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r48" 5INC_PR = "r49"
6 6
7QT_BASE_LIB ?= "libqt-embedded" 7QT_BASE_LIB ?= "libqt-embedded"
8 8
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 9500d4b8ee..5f0fce16f7 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
11 11
12INC_PR = "r16" 12INC_PR = "r17"
13 13
14inherit native 14inherit native
15 15
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 0ae74f7f3d..68b30789bf 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7PROVIDES += "qt4-x11" 7PROVIDES += "qt4-x11"
8 8
9INC_PR = "r46" 9INC_PR = "r47"
10 10
11QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 11QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
12QT_GLFLAGS_qemux86 = "-opengl" 12QT_GLFLAGS_qemux86 = "-opengl"