From 4cf4a5582d4ce30a43e89af41ce11e37118de7a7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 22 Oct 2018 11:22:30 -0700
Subject: [PATCH] Fix Android build on Windows hosts

---
 libraries/ui/src/InteractiveWindow.cpp | 4 ++--
 libraries/ui/src/InteractiveWindow.h   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/ui/src/InteractiveWindow.cpp b/libraries/ui/src/InteractiveWindow.cpp
index 6c7f2d503f..5f7999f826 100644
--- a/libraries/ui/src/InteractiveWindow.cpp
+++ b/libraries/ui/src/InteractiveWindow.cpp
@@ -292,8 +292,8 @@ int InteractiveWindow::getPresentationMode() const {
     return _qmlWindow->property(PRESENTATION_MODE_PROPERTY).toInt();
 }
 
-#ifdef Q_OS_WIN
 void InteractiveWindow::parentNativeWindowToMainWindow() {
+#ifdef Q_OS_WIN
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "parentNativeWindowToMainWindow");
         return;
@@ -307,8 +307,8 @@ void InteractiveWindow::parentNativeWindowToMainWindow() {
     }
     const auto nativeWindow = qvariant_cast<QQuickWindow*>(nativeWindowProperty);
     SetWindowLongPtr((HWND)nativeWindow->winId(), GWLP_HWNDPARENT, (LONG)MainWindow::findMainWindow()->winId());
-}
 #endif
+}
 
 void InteractiveWindow::setPresentationMode(int presentationMode) {
     if (QThread::currentThread() != thread()) {
diff --git a/libraries/ui/src/InteractiveWindow.h b/libraries/ui/src/InteractiveWindow.h
index f456b32e8d..a25d559557 100644
--- a/libraries/ui/src/InteractiveWindow.h
+++ b/libraries/ui/src/InteractiveWindow.h
@@ -84,9 +84,7 @@ private:
     Q_INVOKABLE void setPresentationMode(int presentationMode);
     Q_INVOKABLE int getPresentationMode() const;
 
-#ifdef Q_OS_WIN
     Q_INVOKABLE void parentNativeWindowToMainWindow();
-#endif
 
 public slots: