From 4e0ac2a4be1eb66975bb24e5eb381c2b0048e586 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 18 Apr 2016 16:07:53 -0700 Subject: [PATCH] Remove fix for old QT file path bug in OSX --- interface/src/Application.cpp | 5 ----- libraries/script-engine/src/ScriptEngines.cpp | 5 ----- 2 files changed, 10 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3a0b0998c5..4413ebd0dd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -193,12 +193,7 @@ static const uint32_t INVALID_FRAME = UINT32_MAX; static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation -#ifndef __APPLE__ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); -#else -// Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475 -static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js"); -#endif Setting::Handle maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS); diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 78141188ef..8312de50fb 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -22,12 +22,7 @@ #define __STR1__(x) __STR2__(x) #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " -#ifndef __APPLE__ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); -#else -// Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475 -static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js"); -#endif ScriptsModel& getScriptsModel() { static ScriptsModel scriptsModel;