diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 11:03:36 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 12:04:28 +0100 |
| commit | 1ec312f314343f287956dcab5482571039a94ff1 (patch) | |
| tree | 604453191dd176e0b53f42eb538be017496235b7 /recipes-qt/qt4/files/qmake-hack.diff | |
| parent | 63057a32d7b877c39b85eb3e9168c6fd7e4ce579 (diff) | |
| download | meta-openembedded-1ec312f314343f287956dcab5482571039a94ff1.tar.gz | |
qt4: import files from OE
This gives us both qt4-x11 and qt4-embedded; qt4-x11 was already present in yocto, but was lacking features
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt/qt4/files/qmake-hack.diff')
| -rw-r--r-- | recipes-qt/qt4/files/qmake-hack.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/recipes-qt/qt4/files/qmake-hack.diff b/recipes-qt/qt4/files/qmake-hack.diff new file mode 100644 index 0000000000..290f54052b --- /dev/null +++ b/recipes-qt/qt4/files/qmake-hack.diff | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | --- /tmp/configure 2010-02-10 15:41:58.000000000 +0100 | ||
| 2 | +++ qt-embedded-linux-opensource-src-4.4.3/configure 2010-02-10 15:42:01.000000000 +0100 | ||
| 3 | @@ -3946,6 +3946,12 @@ | ||
| 4 | [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake | ||
| 5 | [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h | ||
| 6 | [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 | ||
| 7 | + | ||
| 8 | +# OE | ||
| 9 | +if [ x$CROSSHACK = xtrue ] ; then | ||
| 10 | + echo "Exiting now, since we have what we want: a qmake binary" | ||
| 11 | + exit 0 | ||
| 12 | +fi | ||
| 13 | fi # Build qmake | ||
| 14 | |||
| 15 | #------------------------------------------------------------------------------- | ||