This reverts commit d50bdd6aa9c8557b92609497ff50dac5231dbcf1.
Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 1 file). Show all
Unified · Split
| @@ -9,7 +9,6 @@ · 8 unmodified lines | ||
| 9 | 9 | #include "ScriptEngines.h" |
| 10 | 10 | |
| 11 | 11 | #include <QtCore/QStandardPaths> |
| 12 | −#include <QtCore/QFileInfo> | |
| 13 | 12 | |
| 14 | 13 | #include <QtWidgets/QApplication> |
| 15 | 14 | |
| @@ -450,7 +449,6 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 434 unmodified lines | ||
| 450 | 449 | return result; |
| 451 | 450 | } |
| 452 | 451 | QUrl scriptUrl; |
| 453 | − | |
| 454 | 452 | if (!scriptFilename.isValid() || |
| 455 | 453 | (scriptFilename.scheme() != "http" && |
| 456 | 454 | scriptFilename.scheme() != "https" && |
| @@ -474,11 +472,8 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 17 unmodified lines | ||
| 474 | 472 | scriptEngine->deleteLater(); |
| 475 | 473 | }, Qt::QueuedConnection); |
| 476 | 474 | |
| 477 | − // Check that the script is actually a script | |
| 478 | − QFileInfo fileInfo(scriptFilename.toString()); | |
| 479 | − bool hasValidScriptSuffix = (fileInfo.completeSuffix() == "js"); | |
| 480 | 475 | |
| 481 | − if (scriptFilename.isEmpty() || !scriptUrl.isValid() || !hasValidScriptSuffix) { | |
| 476 | + if (scriptFilename.isEmpty() || !scriptUrl.isValid()) { | |
| 482 | 477 | launchScriptEngine(scriptEngine); |
| 483 | 478 | } else { |
| 484 | 479 | // connect to the appropriate signals of this script engine |