diff options
| author | Eric Bénard <eric@eukrea.com> | 2013-10-08 10:27:31 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-08 15:50:10 +0200 |
| commit | c845e487d7ce6227f60332b5130812fc8b1e7f05 (patch) | |
| tree | ca9681ad2fdeb8978d8daddea5eee534d7ae75ae | |
| parent | 04458354f18b41e93cba5907296b2317aef1fd05 (diff) | |
qttools-native: update to 5.1.1
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (renamed from recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch) | 22 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools-native_5.1.1.bb (renamed from recipes-qt/qt5/qttools-native_5.1.0.bb) | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index f1b87835..a5f26a3c 100644 --- a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,4 +1,4 @@ -From 4df58d96ea516358d2762a219c0b196e56c8e89b Mon Sep 17 00:00:00 2001 +From 9337242944c936104db5eee64df804a27fb02bb8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.jansa@gmail.com> Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert @@ -15,8 +15,8 @@ Signed-off-by: Martin Jansa <Martin.jansa@gmail.com> src/designer/src/src.pro | 16 +++++++++------- src/linguist/linguist.pro | 2 +- src/src.pro | 10 ++++++---- - tests/auto/auto.pro | 20 +++++++++++--------- - 5 files changed, 29 insertions(+), 23 deletions(-) + tests/auto/auto.pro | 22 ++++++++++++---------- + 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 4955969..8e86419 100644 @@ -103,10 +103,10 @@ index c8756db..d71c4a0 100644 qtNomakeTools( \ pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index 074aa34..a744d46 100644 +index eaf440b..1778ad1 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro -@@ -1,13 +1,15 @@ +@@ -1,14 +1,16 @@ TEMPLATE=subdirs -SUBDIRS=\ - linguist \ @@ -116,7 +116,8 @@ index 074aa34..a744d46 100644 - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ -- cmake +- cmake \ +- installed_cmake +!linguistonly { + SUBDIRS=\ + linguist \ @@ -126,11 +127,12 @@ index 074aa34..a744d46 100644 + qhelpgenerator \ + qhelpindexmodel \ + qhelpprojectdata \ -+ cmake ++ cmake \ ++ installed_cmake +} - # These tests don't make sense for cross-compiled builds - cross_compile:SUBDIRS -= host.pro + installed_cmake.depends = cmake + -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qttools-native_5.1.0.bb b/recipes-qt/qt5/qttools-native_5.1.1.bb index 1da72a4a..82b8c01e 100644 --- a/recipes-qt/qt5/qttools-native_5.1.0.bb +++ b/recipes-qt/qt5/qttools-native_5.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ " -SRC_URI[md5sum] = "f3cc602d4b720a847f4ab0953a82d8ef" -SRC_URI[sha256sum] = "9b9aa948e01bf9d0fc7fa4584ededf9b5b280ee74c334c5790dbc6f9015b3738" +SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" +SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" |