Merge remote-tracking branch 'upstream/master' into android

Brad Davis committed 8 years ago

Commit 8bfc6102 parents 3e552e5 8cb7e05540 files · +26055 −11613Browse files

Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 540 files). Show all

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+1−1

@@ -440,7 +440,7 @@ void AssetScriptingInterface::saveToCache(const QUrl& rawURL, const QByteArray& · 439 unmodified lines
440	JS_VERIFY(url.scheme() == "atp" \|\| url.scheme() == "cache", "only 'atp' and 'cache' URL schemes supported");	440	JS_VERIFY(url.scheme() == "atp" \|\| url.scheme() == "cache", "only 'atp' and 'cache' URL schemes supported");
441	JS_VERIFY(hash.isEmpty() \|\| hash == hashDataHex(data), QString("invalid checksum hash for atp:HASH style URL (%1 != %2)").arg(hash, hashDataHex(data)));	441	JS_VERIFY(hash.isEmpty() \|\| hash == hashDataHex(data), QString("invalid checksum hash for atp:HASH style URL (%1 != %2)").arg(hash, hashDataHex(data)));
442		442
443	qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;	443	// qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
444		444
445	jsPromiseReady(Parent::saveToCache(url, data, metadata), scope, callback);	445	jsPromiseReady(Parent::saveToCache(url, data, metadata), scope, callback);
446	}	446	}