[oe-commits] org.oe.dev packages/qt4/qt4-x11-free.inc, qtopia-core.inc: Require the qt_configuration.inc as well

[freyther commit]

packages/qt4/qt4-x11-free.inc,qtopia-core.inc: Require the qt_configuration.inc as well
    (add fontconfig to the depends of the X11 build as well, I wish I would have an
     interactive mode for mtn...)

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e548ddd508358e89b27d2247c86e8b786897f31a
ViewMTN: http://monotone.openembedded.org/revision/info/e548ddd508358e89b27d2247c86e8b786897f31a
Files:
1
packages/qt4/qt4-x11-free.inc
packages/qt4/qtopia-core.inc
Diffs:

#
# mt diff -r9a909cd84c9ec7550d1acb4dc3d5b3c38c3a12b4 -re548ddd508358e89b27d2247c86e8b786897f31a
#
# 
# 
# patch "packages/qt4/qt4-x11-free.inc"
#  from [b4abf4ba10d86e2654cb188e4f365b92e564e98d]
#    to [8f1c730bd198cdca0bf99e38837e38fd3b0fae28]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [baffc460b4ec1f7a4c2fbbbcdc3ad5ae77b4f5ce]
#    to [441d19da7b57dbb5d5e85b013ba4a65cc7fa5cff]
# 
============================================================
--- packages/qt4/qt4-x11-free.inc	b4abf4ba10d86e2654cb188e4f365b92e564e98d
+++ packages/qt4/qt4-x11-free.inc	8f1c730bd198cdca0bf99e38837e38fd3b0fae28
@@ -1,9 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
 SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-DEPENDS += "virtual/libx11 xft libxext libxrender libxrandr libxcursor"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
 PR = "r6"
 
@@ -21,6 +21,7 @@ require qt_depends.inc
 QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qt4"
 require qt_depends.inc
+require qt_configuration.inc
 require qt_packaging.inc
 require qt_staging.inc
 
============================================================
--- packages/qt4/qtopia-core.inc	baffc460b4ec1f7a4c2fbbbcdc3ad5ae77b4f5ce
+++ packages/qt4/qtopia-core.inc	441d19da7b57dbb5d5e85b013ba4a65cc7fa5cff
@@ -20,6 +20,7 @@ require qt_depends.inc
 QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qtopia"
 require qt_depends.inc
+require qt_configuration.inc
 require qt_packaging.inc
 require qt_staging.inc