History

Merge pull request #7707 from huffman/fix/osx-default-script-dir

Remove fix for old QT file path bug in OSX

Brad Hefta-Gaub committed 10 years ago

Commit 0a79b5d2 parents 0e9bd9a 4e0ac2a2 files · +0 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+0−5
@@ -195,12 +195,7 @@ static const uint32_t INVALID_FRAME = UINT32_MAX; · 194 unmodified lines
195 195
196static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation196static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation
197 197
198#ifndef __APPLE__
199static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);198static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
200#else
201// Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475
202static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js");
203#endif
204 199
205Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS);200Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS);
206 201

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t