From 0453ee71e6f0a8f38c0f78e0bc83f6f14456efc3 Mon Sep 17 00:00:00 2001 From: Torsten Sadowski Date: Mon, 7 Jan 2019 22:09:17 +0100 Subject: [PATCH] Fixed Python3 build, Python slots Qt slots clash --- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 3 ++- src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp | 2 +- src/Gui/3Dconnexion/GuiNativeEventMac.cpp | 2 +- src/Gui/3Dconnexion/GuiNativeEventWin32.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp index 8cd1269307..f785a43a80 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp +++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp @@ -20,10 +20,11 @@ * * ***************************************************************************/ +#include + #include "GuiNativeEventLinux.h" #include "GuiApplicationNativeEventAware.h" -#include #include #include diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp index f97a822c7b..53205be86f 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp +++ b/src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp @@ -20,6 +20,7 @@ * * ***************************************************************************/ +#include #include "SpaceballEvent.h" #include @@ -27,7 +28,6 @@ #include "GuiNativeEventLinuxX11.h" #include "GuiApplicationNativeEventAware.h" -#include #include #include diff --git a/src/Gui/3Dconnexion/GuiNativeEventMac.cpp b/src/Gui/3Dconnexion/GuiNativeEventMac.cpp index 73980b2f6e..63cc93e2ac 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventMac.cpp +++ b/src/Gui/3Dconnexion/GuiNativeEventMac.cpp @@ -29,11 +29,11 @@ Development tools and related technology provided under license from 3Dconnexion With special thanks to marcxs for making the first steps */ +#include #include "GuiNativeEventMac.h" #include #include "GuiApplicationNativeEventAware.h" -#include #include UInt16 Gui::GuiNativeEvent::tdxClientID = 0; diff --git a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp index a73e6af35a..51e56ef07e 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp +++ b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp @@ -36,13 +36,13 @@ http://www.3dconnexion.com/forum/viewtopic.php?f=19&t=4968&sid=72c018bdcf0e6edc9 */ #include "PreCompiled.h" +#include #include "GuiNativeEventWin32.h" #include #include #include -#include #include #include "GuiApplicationNativeEventAware.h" #if QT_VERSION >= 0x050000