diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-21 11:40:11 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-21 13:55:37 +0000 |
| commit | 85cad029464f1209b5aeab7150b6e3df1fa1f69b (patch) | |
| tree | 772e97ec14cb1c5b8960af7b27e542833c6ca65b | |
| parent | 22a0f6b682fb8ef74e11f0e7a2ffac7c8f12222b (diff) | |
Compile with Qt 5.5, 5.6. Minimum version is now 5.5.
Change-Id: I60d248ea38e8176e18a9b2a642e81a0ad5fb21d3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | installerfw.pro | 4 | ||||
| -rw-r--r-- | src/libs/installer/component.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/installerfw.pro b/installerfw.pro index 6dfca3997..c1e058830 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -13,7 +13,7 @@ BUILD_EXAMPLES = $$(BUILDEXAMPLES) isEmpty(BUILD_EXAMPLES):BUILD_EXAMPLES=$${BUILDEXAMPLES} !isEmpty(BUILD_EXAMPLES):SUBDIRS += examples -!minQtVersion(5, 4, 0) { +!minQtVersion(5, 5, 0) { message("Cannot build Qt Installer Framework with Qt version $${QT_VERSION}.") - error("Use at least Qt 5.4.0.") + error("Use at least Qt 5.5.0.") } diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 5346aac77..d379305a8 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -1026,9 +1026,9 @@ inline bool convert(QQmlV4Function *func, QStringList *toArgs) *toArgs << val->toQString(); for (int i = 1; i < func->length(); i++) { val = (*func)[i]; - if (val->isObject() && val->asObject()->isArrayObject()) { + if (val->isObject() && val->as<QV4::Object>()->isArrayObject()) { QV4::ScopedValue valtmp(scope); - QV4::Object *array = val->asObject(); + QV4::Object *array = val->as<QV4::Object>(); uint length = array->getLength(); for (uint ii = 0; ii < length; ++ii) { valtmp = array->getIndexed(ii); |