diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2012-05-11 00:06:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-16 07:34:28 +0100 |
commit | 4910f282556bf5d962e880d8cf43780f13fcd697 (patch) | |
tree | edada69de110feadac2a13e7fb92e52c651a1a2e /meta/recipes-qt/qt-apps | |
parent | 120e29504caa88ce21a8a75a7cec8a2cb857e61b (diff) | |
download | poky-4910f282556bf5d962e880d8cf43780f13fcd697.tar.gz |
fotowall: Add #include ui_wizard.h to ExportWizard.cpp
App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
should be already generated before compiling ExportWizard.cpp.
[YOCTO #2297]
(From OE-Core rev: 2cf6e7cf81c0b864b5d51be60094a6eb3e584383)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt-apps')
-rw-r--r-- | meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch | 18 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 |
2 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch new file mode 100644 index 0000000000..d8b2b2347b --- /dev/null +++ b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one | ||
2 | should be already generated before compiling ExportWizard.cpp. | ||
3 | |||
4 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: Fotowall-0.9/App/ExportWizard.cpp | ||
8 | =================================================================== | ||
9 | --- Fotowall-0.9.orig/App/ExportWizard.cpp 2009-11-30 13:21:31.000000000 +0200 | ||
10 | +++ Fotowall-0.9/App/ExportWizard.cpp 2012-05-10 17:12:06.765230830 +0300 | ||
11 | @@ -23,6 +23,7 @@ | ||
12 | #include "imageloaderqt.h" | ||
13 | #include "posterazorcore.h" | ||
14 | #include "wizard.h" | ||
15 | +#include "ui_wizard.h" | ||
16 | |||
17 | #include <QDesktopServices> | ||
18 | #include <QDesktopWidget> | ||
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb index 52dd727351..3cb79a31a2 100644 --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb | |||
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ | |||
7 | file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" | 7 | file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" |
8 | SECTION = "x11/apps" | 8 | SECTION = "x11/apps" |
9 | 9 | ||
10 | PR = "r2" | 10 | PR = "r3" |
11 | 11 | ||
12 | DEPENDS = "qt4-x11-free" | 12 | DEPENDS = "qt4-x11-free" |
13 | RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff" | 13 | RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff" |
14 | 14 | ||
15 | SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2" | 15 | SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \ |
16 | file://ExportWizard-depends-on-ui_wizard.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438" | 19 | SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438" |
18 | SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d" | 20 | SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d" |