aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-10-19 23:22:04 +0200
committerKoen Kooi <koen@openembedded.org>2010-10-19 23:24:02 +0200
commit55f2ba0c385838dcdd630c32d5f597b3e08d5c99 (patch)
treed6079c4dc44a1c83877a4ba87338e4f7918c75df /recipes/qt4
parent626174dcf53a3d326471d2a88642ad7e271083ac (diff)
downloadopenembedded-55f2ba0c385838dcdd630c32d5f597b3e08d5c99.tar.gz
openembedded-55f2ba0c385838dcdd630c32d5f597b3e08d5c99.tar.bz2
openembedded-55f2ba0c385838dcdd630c32d5f597b3e08d5c99.zip
qt4: move QtDeclarative to qt4.inc
* This avoids pulling in Qt 4.7.0 into meta-toolchain-qte when 4.6.3 is specified * No further changes in behaviour or packaging
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/qt-4.7.0.inc1
-rw-r--r--recipes/qt4/qt4-embedded.inc2
-rw-r--r--recipes/qt4/qt4.inc2
3 files changed, 2 insertions, 3 deletions
diff --git a/recipes/qt4/qt-4.7.0.inc b/recipes/qt4/qt-4.7.0.inc
index 9548577c08..cf4b0d8f63 100644
--- a/recipes/qt4/qt-4.7.0.inc
+++ b/recipes/qt4/qt-4.7.0.inc
@@ -17,7 +17,6 @@ SRC_URI += "file://qte.sh"
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-QT_LIB_NAMES += "QtDeclarative"
FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
do_configure_prepend() {
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 9331302f28..60eb179a6b 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r24"
+INC_PR = "r25"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 6721265570..3bebd4699d 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
export QT_CONF_PATH="${WORKDIR}/qt.conf"
# Library packages
-QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices"
+QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices QtDeclarative"
QT_EXTRA_LIBS = "pvrQWSWSEGL"