diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 22:40:13 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 22:40:13 +0000 |
| commit | 4439f3fd26db6b58f85b5e927600bad7d7a4539b (patch) | |
| tree | c7c75d096d66c87409cb5d2ee9ec0162ba886da2 /classes | |
| parent | 6ad3b4f697a0c942756e8c1c05ada98f2669804a (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/22 23:23:54+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/02/22 23:23:17+01:00 handhelds.org!zecke
Qt 4.0 Beta1:
-Create a qx114 bbclass to override qmake
-Use version four for uic, moc, qrr
-Correct fetching the source (tar.bz2 didn't work) and it is named opensource
and not free
-Mark it as BROKEN and add comments about known errors
2005/02/22 19:45:42+01:00 handhelds.org!zecke
QPF Font Handling:
Use the palmtopdir instead of hardcoding /opt/QtPalmtop
BKrev: 421bb4cdX_F5PVSIybTGnWqDS-go_A
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qpf.bbclass | 3 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index 7073d25f7e..45cf7d448e 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -18,11 +18,12 @@ ${sbindir}/update-qtfontdir python populate_packages_prepend() { postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) postrm = postinst + fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' pkgregex = "^([a-z]*_[0-9]*).*.qpf$" pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' - do_split_packages(d, root='/opt/QtPalmtop/lib/fonts', file_regex=pkgregex, output_pattern=pkgpattern, + do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, extra_depends='qpf-font-common') } diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/classes/qt4x11.bbclass |