From 50e8f49f5241820f364e9beeb783ab6731d160af Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 5 Nov 2015 10:54:50 -0800 Subject: [PATCH] SpacemouseManager Moved stub init into cpp file. This should fix the windows build. For some reason the linker was having a problem resolving this. --- .../input-plugins/src/input-plugins/SpacemouseManager.cpp | 3 +++ libraries/input-plugins/src/input-plugins/SpacemouseManager.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp b/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp index 9c1307a18e..43e6ee48a8 100644 --- a/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp +++ b/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp @@ -130,6 +130,9 @@ void SpacemouseManager::ManagerFocusOutEvent() { instance->focusOutEvent(); } +void SpacemouseManager::init() { +} + #ifdef HAVE_3DCONNEXIONCLIENT #ifdef Q_OS_WIN diff --git a/libraries/input-plugins/src/input-plugins/SpacemouseManager.h b/libraries/input-plugins/src/input-plugins/SpacemouseManager.h index e444b73d9f..08ac954c94 100644 --- a/libraries/input-plugins/src/input-plugins/SpacemouseManager.h +++ b/libraries/input-plugins/src/input-plugins/SpacemouseManager.h @@ -25,7 +25,7 @@ class SpacemouseManager : public QObject { public: static SpacemouseManager& getInstance(); void ManagerFocusOutEvent(); - void init() {}; + void init(); void destroy() {}; bool Is3dmouseAttached() { return false; }; public slots: