aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-12-11 15:52:18 +1100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-11 13:24:22 +0100
commit6566f728ab3d14a4908516fb13ad555dbfe04471 (patch)
treed73319dd12e71d434c01b25d04f9b5c84a5c83cc /conf
parentc9a1041cb956d94c04cbf635b00ca19725ffc129 (diff)
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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/qt5-versions.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 3048e153..9acde7fb 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/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}"