History

Merge pull request #10792 from jherico/qml_crashes

Trying to fix QtQml/QtScript crashes

Brad Hefta-Gaub committed 9 years ago

Commit dc649e82 parents 63279f4 341646c47 files · +665 −461Browse files

Showing the changes to interface/src/Menu.cpp (1 of 47 files). Show all

Unified · Split

interface/src/Menu.cpp+8−3
@@ -19,7 +19,7 @@ · 18 unmodified lines
19#include <AudioClient.h>19#include <AudioClient.h>
20#include <CrashHelpers.h>20#include <CrashHelpers.h>
21#include <DependencyManager.h>21#include <DependencyManager.h>
22#include <TabletScriptingInterface.h>22#include <ui/TabletScriptingInterface.h>
23#include <display-plugins/DisplayPlugin.h>23#include <display-plugins/DisplayPlugin.h>
24#include <PathUtils.h>24#include <PathUtils.h>
25#include <SettingHandle.h>25#include <SettingHandle.h>
@@ -121,9 +121,14 @@ Menu::Menu() { · 95 unmodified lines
121 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");121 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
122 122
123 // Edit > Reload All Scripts... [advanced]123 // Edit > Reload All Scripts... [advanced]
124 addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::Key_R,124 action = addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::Key_R,
125 scriptEngines.data(), SLOT(reloadAllScripts()),125 nullptr, nullptr,
126 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");126 QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
127 connect(action, &QAction::triggered, [] {
128 DependencyManager::get<ScriptEngines>()->reloadAllScripts();
129 DependencyManager::get<OffscreenUi>()->clearCache();
130 });
131
127 132
128 // Edit > Console... [advanced]133 // Edit > Console... [advanced]
129 addActionToQMenuAndActionHash(editMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,134 addActionToQMenuAndActionHash(editMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,