From 62372415bea424007f985be179974b72b7a32358 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 14:01:35 -0700 Subject: [PATCH] get this working on windows --- libraries/script-engine/src/ScriptEngines.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 4 +++- libraries/shared/src/PathUtils.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 96e4180704..8ce11a0d4c 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -51,7 +51,7 @@ QUrl normalizeScriptURL(const QUrl& rawScriptURL) { #else // Force lowercase on file scripts because of drive letter weirdness. if (rawScriptURL.isLocalFile()) { - fullNormal.setPath(fullNormal.path.toLower()); + fullNormal.setPath(fullNormal.path().toLower()); } #endif // if this url is something "beneath" the default script url, replace the local path with ~ diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index f616847528..9513a333bc 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -162,10 +162,12 @@ void ScriptsModel::requestDefaultFiles(QString marker) { // QString localDir = url.toLocalFile() + "/scripts"; QString localDir = expandScriptUrl(url).toLocalFile() + "/scripts"; int localDirPartCount = localDir.split("/").size(); + #ifdef Q_OS_WIN + localDirPartCount++; // one for the drive letter + #endif QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { QUrl jsFullPath = QUrl::fromLocalFile(it.next()); - // QString jsPartialPath = jsFullPath.path().mid(localDir.length() + 1); // + 1 to skip a separator QString jsPartialPath = jsFullPath.path().split("/").mid(localDirPartCount).join("/"); jsFullPath = normalizeScriptURL(jsFullPath); _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath.toString(), SCRIPT_ORIGIN_DEFAULT)); diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 0fe11df28a..31dc9b2ed3 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -57,7 +57,7 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector