diff options
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/linux.conf | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/linux.conf | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-native.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf index a54135513b..86703813ca 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf +++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf | |||
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) | |||
29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) | 29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) |
30 | QMAKE_LIBS_NIS = -lnsl | 30 | QMAKE_LIBS_NIS = -lnsl |
31 | QMAKE_LIBS_EGL = -lEGL | 31 | QMAKE_LIBS_EGL = -lEGL |
32 | QMAKE_LIBS_OPENGL = -lGLU -lGL | 32 | QMAKE_LIBS_OPENGL = -lGL |
33 | QMAKE_LIBS_OPENGL_QT = -lGL | 33 | QMAKE_LIBS_OPENGL_QT = -lGL |
34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM | 34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM |
35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 | 35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 |
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf index a54135513b..86703813ca 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf +++ b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf | |||
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) | |||
29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) | 29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) |
30 | QMAKE_LIBS_NIS = -lnsl | 30 | QMAKE_LIBS_NIS = -lnsl |
31 | QMAKE_LIBS_EGL = -lEGL | 31 | QMAKE_LIBS_EGL = -lEGL |
32 | QMAKE_LIBS_OPENGL = -lGLU -lGL | 32 | QMAKE_LIBS_OPENGL = -lGL |
33 | QMAKE_LIBS_OPENGL_QT = -lGL | 33 | QMAKE_LIBS_OPENGL_QT = -lGL |
34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM | 34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM |
35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 | 35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 |
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index afca7f881f..fbd8c28f77 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 | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | HOMEPAGE = "http://qt.nokia.com" | 3 | HOMEPAGE = "http://qt.nokia.com" |
4 | DEPENDS += "directfb tslib" | 4 | DEPENDS += "directfb tslib" |
5 | INC_PR = "r49" | 5 | INC_PR = "r50" |
6 | 6 | ||
7 | QT4EDEPENDS = "" | 7 | QT4EDEPENDS = "" |
8 | QT_BASE_LIB ?= "libqt-embedded" | 8 | QT_BASE_LIB ?= "libqt-embedded" |
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 5f0fce16f7..ad207231c7 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 | ||
12 | INC_PR = "r17" | 12 | INC_PR = "r18" |
13 | 13 | ||
14 | inherit native | 14 | inherit native |
15 | 15 | ||
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 20ad30c579..a50b0c7760 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -7,7 +7,7 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li | |||
7 | PROVIDES += "qt4-x11" | 7 | PROVIDES += "qt4-x11" |
8 | QT4DEPENDS = "" | 8 | QT4DEPENDS = "" |
9 | 9 | ||
10 | INC_PR = "r47" | 10 | INC_PR = "r48" |
11 | 11 | ||
12 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 12 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
13 | QT_GLFLAGS_qemux86 = "-opengl" | 13 | QT_GLFLAGS_qemux86 = "-opengl" |