diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-13 11:04:58 +0200 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-13 11:04:58 +0200 |
commit | 294f5bb1395138045b1bf9403d9cc47014b1a825 (patch) | |
tree | b278f0a46c6f1e9bd806e2d94d87c35d485437a6 /recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch | |
parent | 4b2780d203083dc4647fc81e7d978579620bfeaf (diff) | |
parent | 8786dbcabdb3f9c0dec743298af8b4e7005a3b0a (diff) |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch')
-rw-r--r-- | recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch new file mode 100644 index 0000000000..1f73f8950f --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch @@ -0,0 +1,22 @@ +diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +--- qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro 2010-06-26 13:15:06.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro 2010-06-26 13:18:17.000000000 +0200 +@@ -1,6 +1,6 @@ + TEMPLATE = app + TARGET = browser +-QT += webkit network mediaservices ++QT += webkit network mediaservices xmlpatterns phonon + + CONFIG += qt warn_on + contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools +diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro +--- qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-05-04 02:43:18.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-06-26 13:17:42.000000000 +0200 +@@ -1,6 +1,6 @@ + + FORMS += forms/mainwindow.ui +-QT += xmlpatterns webkit ++QT += xmlpatterns webkit mediaservices phonon + SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp + HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h + RESOURCES = queries.qrc |