diff options
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-native.inc | 5 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc index 7621d629f1..9c78e7cd5e 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native.inc +++ b/meta/recipes-qt/qt4/qt4-tools-native.inc | |||
@@ -43,11 +43,8 @@ TOBUILD = "\ | |||
43 | src/tools/uic \ | 43 | src/tools/uic \ |
44 | src/tools/rcc \ | 44 | src/tools/rcc \ |
45 | src/network \ | 45 | src/network \ |
46 | src/gui \ | ||
47 | src/tools/uic3 \ | ||
48 | tools/linguist/lrelease \ | 46 | tools/linguist/lrelease \ |
49 | tools/linguist/lupdate \ | 47 | tools/linguist/lupdate \ |
50 | tools/qdbus \ | ||
51 | " | 48 | " |
52 | 49 | ||
53 | do_compile() { | 50 | do_compile() { |
@@ -61,7 +58,7 @@ NATIVE_INSTALL_WORKS = "1" | |||
61 | do_install() { | 58 | do_install() { |
62 | install -d ${D}${bindir}/ | 59 | install -d ${D}${bindir}/ |
63 | install -m 0755 bin/qmake ${D}${bindir}/qmake2 | 60 | install -m 0755 bin/qmake ${D}${bindir}/qmake2 |
64 | for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do | 61 | for i in moc uic rcc lrelease lupdate; do |
65 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 | 62 | install -m 0755 bin/${i} ${D}${bindir}/${i}4 |
66 | done | 63 | done |
67 | 64 | ||
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb index de24b38dea..ac66eb3d5a 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb +++ b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb | |||
@@ -4,8 +4,8 @@ LICENSE = "LGPLv2.1 | GPLv3" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | 4 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ |
5 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | 5 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ |
6 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | 6 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" |
7 | PR = "r0" | 7 | PR = "r2" |
8 | 8 | ||
9 | EXTRA_OECONF += " -no-fast -silent -no-rpath" | 9 | EXTRA_OECONF += " -no-fast -silent -no-rpath -no-freetype -no-fontconfig" |
10 | 10 | ||
11 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" | 11 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" |