Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:23:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use the new JS script location

Browse source
This commit is contained in:
Andrew Meadows 2016-04-26 11:20:08 -07:00
parent c0b446ca4b
commit 3d1abf8fb1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/CMakeLists.txt
View file

@ -269,7 +269,7 @@ endif (APPLE)
if (SCRIPTS_INSTALL_DIR) if (SCRIPTS_INSTALL_DIR)
# setup install of scripts beside interface executable # setup install of scripts beside interface executable
install( install(
DIRECTORY "${CMAKE_SOURCE_DIR}/examples/" DIRECTORY "${CMAKE_SOURCE_DIR}/scripts/"
DESTINATION ${SCRIPTS_INSTALL_DIR}/scripts DESTINATION ${SCRIPTS_INSTALL_DIR}/scripts
COMPONENT ${CLIENT_COMPONENT} COMPONENT ${CLIENT_COMPONENT}
) )

2
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -253,7 +253,7 @@ static const QString SETTINGS_KEY = "Settings";
void ScriptEngines::loadDefaultScripts() { void ScriptEngines::loadDefaultScripts() {
QUrl defaultScriptsLoc = defaultScriptsLocation(); QUrl defaultScriptsLoc = defaultScriptsLocation();
defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/defaultScripts.js"); defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/default/defaultScripts.js");
loadScript(defaultScriptsLoc.toString()); loadScript(defaultScriptsLoc.toString());
} }