summaryrefslogtreecommitdiff
path: root/meta-qt5/conf
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-12-11 15:52:18 +1100
committerPatrick Ohly <patrick.ohly@intel.com>2015-01-09 08:46:24 -0800
commit8143489a411623ecac61ed32b90466ce76377315 (patch)
tree6130d2d5917bf672a77ec1e7070be8e8ddc2f221 /meta-qt5/conf
parent516a1099ec40c27b428211a438a3d5ce259a9d6f (diff)
downloadtizen-distro-8143489a411623ecac61ed32b90466ce76377315.tar.gz
tizen-distro-8143489a411623ecac61ed32b90466ce76377315.tar.bz2
tizen-distro-8143489a411623ecac61ed32b90466ce76377315.zip
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc (From meta-qt5 rev: 6566f728ab3d14a4908516fb13ad555dbfe04471) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5/conf')
-rw-r--r--meta-qt5/conf/distro/include/qt5-versions.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-qt5/conf/distro/include/qt5-versions.inc b/meta-qt5/conf/distro/include/qt5-versions.inc
index 3048e1538c..9acde7fb85 100644
--- a/meta-qt5/conf/distro/include/qt5-versions.inc
+++ b/meta-qt5/conf/distro/include/qt5-versions.inc
@@ -1,7 +1,7 @@
# Select which version you prefer by defining QT5_VERSION and including this file
-# possible values now "5.3.2", "5.3.99+5.4.0-rc1+git%"
+# possible values now "5.4.0", "5.3.99+5.4.0-rc1+git%"
-QT5_VERSION ?= "5.3.2"
+QT5_VERSION ?= "5.4.0"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"