shifting classes around and adding static initializers to resolve dependencies on scripting-engine (and drop dependencies from scripting-engine)

Heather Anderson committed 5 years ago

Commit 665ea521 parent 1f4f45853 files · +457 −404Browse files

Showing the changes to plugins/JSAPIExample (2 of 53 files). Show all

Unified · Split

2 files

plugins/JSAPIExample/CMakeLists.txt +0 −2
plugins/JSAPIExample/src/JSAPIExample.cpp +2 −2

plugins/JSAPIExample/CMakeLists.txt+0−2

@@ -1,6 +1,4 @@
1	1	set(TARGET_NAME JSAPIExample)
2	2	setup_hifi_client_server_plugin(scripting)
3	3	link_hifi_libraries(shared plugins script-engine)
4		−include_hifi_library_headers(animation)
5		−include_hifi_library_headers(entities)
6	4	include_hifi_library_headers(networking)

plugins/JSAPIExample/src/JSAPIExample.cpp+2−2

@@ -64,7 +64,7 @@ namespace REPLACE_ME_WITH_UNIQUE_NAME { · 63 unmodified lines
64	64	}
65	65	qCWarning(logger) << "registering w/ScriptInitializerMixin..." << scriptInit.data();
66	66	scriptInit->registerScriptInitializer([this](ScriptEngine* engine) {
67		− auto value = engine->newQObject(this, ScriptEngine::QtOwnership, ScriptEngine::ExcludeDeleteLater);
	67	+ auto value = engine->newQObject(this, ScriptEngine::QtOwnership);
68	68	engine->globalObject()->setProperty(objectName(), value);
69	69	// qCDebug(logger) << "setGlobalInstance" << objectName() << engine->property("fileName");
70	70	});
@@ -175,7 +175,7 @@ namespace REPLACE_ME_WITH_UNIQUE_NAME { · 104 unmodified lines
175	175	raiseScriptingError(context(), "error creating scoped settings instance: " + error);
176	176	return engine->nullValue();
177	177	}
178		− return engine->newQObject(cppValue, ScriptEngine::ScriptOwnership, ScriptEngine::ExcludeDeleteLater);
	178	+ return engine->newQObject(cppValue, ScriptEngine::ScriptOwnership);
179	179	}
180	180
181	181	private: