Trying to fix QtQml/QtScript crashes
Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 47 files). Show all
Unified · Split
| @@ -24,6 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #include <QtWidgets/QMainWindow> |
| 26 | 26 | #include <QtWidgets/QApplication> |
| 27 | +#include <QtWidgets/QMenuBar> | |
| 28 | +#include <QtWidgets/QMenu> | |
| 27 | 29 | |
| 28 | 30 | #include <QtNetwork/QNetworkRequest> |
| 29 | 31 | #include <QtNetwork/QNetworkReply> |
| @@ -48,7 +50,6 @@ · 18 unmodified lines | ||
| 48 | 50 | #include <ScriptAvatarData.h> |
| 49 | 51 | #include <udt/PacketHeaders.h> |
| 50 | 52 | #include <UUID.h> |
| 51 | −#include <ui/Menu.h> | |
| 52 | 53 | |
| 53 | 54 | #include <controllers/ScriptingInterface.h> |
| 54 | 55 | #include <AnimationObject.h> |
| @@ -70,7 +71,6 @@ · 15 unmodified lines | ||
| 70 | 71 | #include "WebSocketClass.h" |
| 71 | 72 | #include "RecordingScriptingInterface.h" |
| 72 | 73 | #include "ScriptEngines.h" |
| 73 | −#include "TabletScriptingInterface.h" | |
| 74 | 74 | #include "ModelScriptingInterface.h" |
| 75 | 75 | |
| 76 | 76 | |
| @@ -697,8 +697,6 @@ void ScriptEngine::init() { · 620 unmodified lines | ||
| 697 | 697 | // constants |
| 698 | 698 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 699 | 699 | |
| 700 | − registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data()); | |
| 701 | − qScriptRegisterMetaType(this, tabletToScriptValue, tabletFromScriptValue); | |
| 702 | 700 | registerGlobalObject("Assets", &_assetScriptingInterface); |
| 703 | 701 | registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data()); |
| 704 | 702 | |