summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-06-06 16:19:07 +0200
committerKoen Kooi <koen@openembedded.org>2010-06-06 16:19:07 +0200
commitc070de32d40dd561b63de5b4f41baa3cf822ef5b (patch)
tree108d65920675ba68cab9722e47cdbc8b0c998fbe
parenta024da1d8ea3cb5d7dcc6d5a0da9d47b8a80cfa8 (diff)
qt 4.7.0-beta1: fix versioning
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1.inc (renamed from recipes/qt4/qt-4.7.0-beta1.inc)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0002-Disable-tools-assistant.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0003-Disable-examples-designer.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0005-Disable-examples-help.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0006-Disable-demos-browser.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0007-Disable-demos-qtdemos.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0008-Disable-examples-declarative.patch)0
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch (renamed from recipes/qt4/qt-4.7.0-beta1/0009-Disable-demos-affine.patch)0
-rw-r--r--recipes/qt4/qt4-tools-native_4.7.0-beta1.bb2
-rw-r--r--recipes/qt4/qt4-x11-free_4.7.0-beta1.bb2
12 files changed, 4 insertions, 0 deletions
diff --git a/recipes/qt4/qt-4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
index c691981d92..c691981d92 100644
--- a/recipes/qt4/qt-4.7.0-beta1.inc
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
diff --git a/recipes/qt4/qt-4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch
index 71a04a59d2..71a04a59d2 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch
index 1a5da6793b..1a5da6793b 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0002-Disable-tools-assistant.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch
index 51fa4a6d6e..51fa4a6d6e 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0003-Disable-examples-designer.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch
index cef56ef29b..cef56ef29b 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch
index 026f2b08e9..026f2b08e9 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0005-Disable-examples-help.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch
index e863f12749..e863f12749 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0006-Disable-demos-browser.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch
index 6bef4c2dba..6bef4c2dba 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0007-Disable-demos-qtdemos.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch
index 06e15623f7..06e15623f7 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0008-Disable-examples-declarative.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch
diff --git a/recipes/qt4/qt-4.7.0-beta1/0009-Disable-demos-affine.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch
index c4efddaf7b..c4efddaf7b 100644
--- a/recipes/qt4/qt-4.7.0-beta1/0009-Disable-demos-affine.patch
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch
diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
index 5d3f55ceec..0539c049e0 100644
--- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
+++ b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb
@@ -2,6 +2,8 @@ DEFAULT_PREFERENCE = "-1"
require qt4-tools-native.inc
LICENSE = "LGPLv2.1 GPLv3"
+
+PV = "4.6.2+4.7.0-beta1"
PR = "${INC_PR}.0"
EXTRA_OECONF += " -no-fast -silent -no-rpath"
diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
index 250d4ccd9a..228b686d95 100644
--- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
+++ b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb
@@ -1,6 +1,8 @@
DEFAULT_PREFERENCE = "-1"
require qt4-x11-free.inc
+
+PV = "4.6.2+4.7.0-beta1"
PR = "${INC_PR}.0"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "