mirror of
https://github.com/QuasarApp/installer-framework.git
synced 2025-05-04 01:09:33 +00:00
Compile with Qt 5.5, 5.6. Minimum version is now 5.5.
Change-Id: I60d248ea38e8176e18a9b2a642e81a0ad5fb21d3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
parent
22a0f6b682
commit
85cad02946
@ -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.")
|
||||
}
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user