diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-23 23:43:30 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-23 23:43:30 +0000 |
| commit | 39dbfbe23ad2f6dc14244d27c08fd4979918bea4 (patch) | |
| tree | 0e086ad7a9451aee53f56faad6dac72bbe5cf347 /packages/qt4 | |
| parent | ced0b53cbc44fa1ab91666955b9cf17cfe2dcae7 (diff) | |
packages/qt4: Move QtopiaCore over to the qt4_arch.inc
Diffstat (limited to 'packages/qt4')
| -rw-r--r-- | packages/qt4/qte-functions.inc | 11 | ||||
| -rw-r--r-- | packages/qt4/qtopia-core_4.2.0.bb | 2 | ||||
| -rw-r--r-- | packages/qt4/qtopia-core_4.3.3.bb | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc deleted file mode 100644 index f0ffb0e612..0000000000 --- a/packages/qt4/qte-functions.inc +++ /dev/null @@ -1,11 +0,0 @@ -def qte_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb index 509230f3ea..1e10fcde77 100644 --- a/packages/qt4/qtopia-core_4.2.0.bb +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -55,7 +55,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" -require qte-functions.inc +require qt4_arch.inc QT_ARCH := "${@qte_arch(d)}" # FIXME use info.bbclass once it has been commited diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 2995988b42..0e94145df0 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -40,7 +40,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" -require qte-functions.inc +require qt4_arch.inc QT_ARCH := "${@qte_arch(d)}" # FIXME use info.bbclass once it has been commited |