diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:49:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:50:10 +0100 |
commit | 1defbaf8b7339accc2660858f890bd36e325bff9 (patch) | |
tree | 7a81bb490e00ba5cbb878a4f4b50bbe591e0d7cf /meta/recipes-qt | |
parent | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (diff) | |
download | poky-1defbaf8b7339accc2660858f890bd36e325bff9.tar.gz |
qt4: Take PV increase opportunity to drop PR
(From OE-Core rev: b97570c66737a6c404b49459cd95184abb855399)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-native_4.8.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb index 6a7eefe24e..9e5743bb43 100644 --- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb | |||
@@ -1,7 +1,5 @@ | |||
1 | require nativesdk-qt4-tools.inc | 1 | require nativesdk-qt4-tools.inc |
2 | 2 | ||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" | 3 | SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" |
6 | 4 | ||
7 | SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" | 5 | SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" |
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb index c08927edff..1435d857ce 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb | |||
@@ -1,8 +1,6 @@ | |||
1 | require qt4-${PV}.inc | 1 | require qt4-${PV}.inc |
2 | require qt4-embedded.inc | 2 | require qt4-embedded.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.4" | ||
5 | |||
6 | QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" | 4 | QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" |
7 | 5 | ||
8 | QT_CONFIG_FLAGS += " \ | 6 | QT_CONFIG_FLAGS += " \ |
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb index 85ca0f8d97..2443cc4b10 100644 --- a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb | |||
@@ -1,7 +1,5 @@ | |||
1 | require qt4-native.inc | 1 | require qt4-native.inc |
2 | 2 | ||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" | 3 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" |
6 | 4 | ||
7 | SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" | 5 | SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" |
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb index d6edef9442..5cb5e6817d 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb | |||
@@ -1,8 +1,6 @@ | |||
1 | require qt4-x11-free.inc | 1 | require qt4-x11-free.inc |
2 | require qt4-${PV}.inc | 2 | require qt4-${PV}.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.4" | ||
5 | |||
6 | QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" | 4 | QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}" |
7 | 5 | ||
8 | QT_CONFIG_FLAGS += " \ | 6 | QT_CONFIG_FLAGS += " \ |