History

resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit 7773a942 parents b4cfce8 e38562b14 files · +3920 −31Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -681,8 +681,8 @@ void ScriptEngine::include(const QString& includeFile) { · 680 unmodified lines
681681 QUrl url = resolveInclude(includeFile);
682682 QString includeContents;
683683
684− if (url.scheme() == "http" || url.scheme() == "ftp") {
685− QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
684+ if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
685+ NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
686686 QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
687687 qDebug() << "Downloading included script at" << includeFile;
688688 QEventLoop loop;