Merge pull request #2100

171e1fc Fix checking for gui updates (mmbyday)
This commit is contained in:
luigi1111
2019-05-03 12:46:42 -05:00
3 changed files with 29 additions and 14 deletions

View File

@@ -78,9 +78,10 @@
bool isIOS = false;
bool isAndroid = false;
bool isWindows = false;
bool isMac = false;
bool isLinux = false;
bool isDesktop = false;
bool isOpenGL = true;
bool isLinux = false;
int main(int argc, char *argv[])
{
@@ -98,6 +99,8 @@ int main(int argc, char *argv[])
bool isWindows = true;
#elif defined(Q_OS_LINUX)
bool isLinux = true;
#elif defined(Q_OS_MAC)
bool isMac = true;
#endif
// detect low graphics mode (start-low-graphics-mode.bat)
@@ -316,6 +319,8 @@ int main(int argc, char *argv[])
#endif
engine.rootContext()->setContextProperty("isWindows", isWindows);
engine.rootContext()->setContextProperty("isMac", isMac);
engine.rootContext()->setContextProperty("isLinux", isLinux);
engine.rootContext()->setContextProperty("isIOS", isIOS);
engine.rootContext()->setContextProperty("isAndroid", isAndroid);
engine.rootContext()->setContextProperty("isOpenGL", isOpenGL);