History

Standalone Tags - checkpoint

Roxanne Skelly committed 7 years ago

Commit be98fb11 parent ab1a6918 files · +113 −12Browse files

Showing the changes to interface/src/scripting/PlatformInfoScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

interface/src/scripting/PlatformInfoScriptingInterface.cpp+10−2
@@ -7,7 +7,7 @@ · 6 unmodified lines
7//7//
8#include "PlatformInfoScriptingInterface.h"8#include "PlatformInfoScriptingInterface.h"
9#include "Application.h"9#include "Application.h"
10 10#include <shared/GlobalAppProperties.h>
11#include <thread>11#include <thread>
12 12
13#ifdef Q_OS_WIN13#ifdef Q_OS_WIN
@@ -138,6 +138,14 @@ bool PlatformInfoScriptingInterface::has3DHTML() { · 124 unmodified lines
138#if defined(Q_OS_ANDROID)138#if defined(Q_OS_ANDROID)
139 return false;139 return false;
140#else140#else
141 return true;141 return !qApp->property(hifi::properties::STANDALONE).toBool();
142#endif
143}
144
145bool PlatformInfoScriptingInterface::isStandalone() {
146#if defined(Q_OS_ANDROID)
147 return false;
148#else
149 return qApp->property(hifi::properties::STANDALONE).toBool();
142#endif150#endif
143}151}