History

Pass tablet QQuickItem to TabletScriptingInterface

Also, moved TabletScriptingInterface to script-engine library for easy access, baby.

Anthony J. Thibault committed 9 years ago

Commit d4f9d211 parent db0b2ba6 files · +21 −4Browse files

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

Unified · Split

interface/src/Application.cpp+1−3
@@ -104,6 +104,7 @@ · 103 unmodified lines
104104 #include <ScriptCache.h>
105105 #include <SoundCache.h>
106106 #include <steamworks-wrapper/SteamClient.h>
107+#include <TabletScriptingInterface.h>
107108 #include <Tooltip.h>
108109 #include <udt/PacketHeaders.h>
109110 #include <UserActivityLogger.h>
@@ -144,7 +145,6 @@ · 34 unmodified lines
144145 #include "scripting/SettingsScriptingInterface.h"
145146 #include "scripting/WindowScriptingInterface.h"
146147 #include "scripting/ControllerScriptingInterface.h"
147−#include "scripting/TabletScriptingInterface.h"
148148 #include "scripting/ToolbarScriptingInterface.h"
149149 #include "scripting/RatesScriptingInterface.h"
150150 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -5183,8 +5183,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 5032 unmodified lines
51835183 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
51845184 scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
51855185
5186− scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
5187−
51885186 scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
51895187 scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
51905188

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t