History

Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race

Seth Alves committed 9 years ago

Commit 43b73f02 parents 5133ce0 e599e1342 files · +124 −124Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−1
@@ -1172,7 +1172,8 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 1171 unmodified lines
1172 // Guard against meaningless query and fragment parts.1172 // Guard against meaningless query and fragment parts.
1173 // Do NOT use PreferLocalFile as its behavior is unpredictable (e.g., on defaultScriptsLocation())1173 // Do NOT use PreferLocalFile as its behavior is unpredictable (e.g., on defaultScriptsLocation())
1174 const auto strippingFlags = QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment;1174 const auto strippingFlags = QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment;
1175 for (QString file : includeFiles) {1175 for (QString includeFile : includeFiles) {
1176 QString file = ResourceManager::normalizeURL(includeFile);
1176 QUrl thisURL;1177 QUrl thisURL;
1177 bool isStandardLibrary = false;1178 bool isStandardLibrary = false;
1178 if (file.startsWith("/~/")) {1179 if (file.startsWith("/~/")) {