diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/qt5-versions.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 94b04625..0fc4e621 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc | |||
| @@ -1,12 +1,13 @@ | |||
| 1 | # Select which version you prefer by defining QT5_VERSION and including this file | 1 | # Select which version you prefer by defining QT5_VERSION and including this file |
| 2 | # possible values now "5.3.0", "5.3.0+git%" | 2 | # possible values now "5.3.1", "5.3.0+git%" |
| 3 | 3 | ||
| 4 | QT5_VERSION ?= "5.3.0" | 4 | QT5_VERSION ?= "5.3.1" |
| 5 | 5 | ||
| 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" | 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" |
| 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" | 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" |
| 8 | PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" | 8 | PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}" |
| 9 | PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" | 9 | PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" |
| 10 | PREFERRED_VERSION_qtenginio = "${QT5_VERSION}" | ||
| 10 | PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" | 11 | PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" |
| 11 | PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" | 12 | PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" |
| 12 | PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" | 13 | PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" |
| @@ -26,7 +27,3 @@ PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" | |||
| 26 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" | 27 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" |
| 27 | PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" | 28 | PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" |
| 28 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" | 29 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" |
| 29 | |||
| 30 | # qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791 | ||
| 31 | QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}" | ||
| 32 | PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}" | ||
