History

include script in default script location

Seth Alves committed 10 years ago

Commit 0f288241 parent 5a665f93 files · +6 −8Browse files

Showing the changes to libraries/script-engine/src/ScriptsModel.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/ScriptsModel.cpp+2−4
@@ -25,7 +25,6 @@ · 24 unmodified lines
2525 #define __STR1__(x) __STR2__(x)
2626 #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: "
2727
28−static const QString MODELS_LOCATION = "scripts/";
2928 static const QString PREFIX_PARAMETER_NAME = "prefix";
3029 static const QString MARKER_PARAMETER_NAME = "marker";
3130 static const QString IS_TRUNCATED_NAME = "IsTruncated";
@@ -159,8 +158,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) { · 127 unmodified lines
159158
160159 if (url.isLocalFile()) {
161160 // if the url indicates a local directory, use QDirIterator
162− // QString localDir = url.toLocalFile() + "/scripts";
163− QString localDir = expandScriptUrl(url).toLocalFile() + "/scripts";
161+ QString localDir = expandScriptUrl(url).toLocalFile();
164162 int localDirPartCount = localDir.split("/").size();
165163 #ifdef Q_OS_WIN
166164 localDirPartCount++; // one for the drive letter
@@ -176,7 +174,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) { · 9 unmodified lines
176174 } else {
177175 // the url indicates http(s), use QNetworkRequest
178176 QUrlQuery query;
179− query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
177+ query.addQueryItem(PREFIX_PARAMETER_NAME, ".");
180178 if (!marker.isEmpty()) {
181179 query.addQueryItem(MARKER_PARAMETER_NAME, marker);
182180 }