repair NetworkAccessManager returns, handle custom AS port in assignment-client

Stephen Birarda committed 12 years ago

Commit f19c5c91 parent 78920239 files · +27 −20Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2

@@ -157,7 +157,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 156 unmodified lines
157	emit errorMessage("ERROR Loading file:" + fileName);	157	emit errorMessage("ERROR Loading file:" + fileName);
158	}	158	}
159	} else {	159	} else {
160	NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();	160	QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
161	QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));	161	QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
162	qDebug() << "Downloading script at" << url;	162	qDebug() << "Downloading script at" << url;
163	QEventLoop loop;	163	QEventLoop loop;
@@ -682,7 +682,7 @@ void ScriptEngine::include(const QString& includeFile) { · 518 unmodified lines
682	QString includeContents;	682	QString includeContents;
683		683
684	if (url.scheme() == "http" \|\| url.scheme() == "ftp") {	684	if (url.scheme() == "http" \|\| url.scheme() == "ftp") {
685	NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();	685	QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
686	QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));	686	QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
687	qDebug() << "Downloading included script at" << includeFile;	687	qDebug() << "Downloading included script at" << includeFile;
688	QEventLoop loop;	688	QEventLoop loop;