Fixed Python3 build, Python slots Qt slots clash

This commit is contained in:
Torsten Sadowski
2019-01-07 22:09:17 +01:00
committed by wmayer
parent 2d5fd706f2
commit 0453ee71e6
4 changed files with 5 additions and 4 deletions

View File

@@ -20,10 +20,11 @@
* *
***************************************************************************/
#include <FCConfig.h>
#include "GuiNativeEventLinux.h"
#include "GuiApplicationNativeEventAware.h"
#include <FCConfig.h>
#include <Base/Console.h>
#include <QMainWindow>

View File

@@ -20,6 +20,7 @@
* *
***************************************************************************/
#include <FCConfig.h>
#include "SpaceballEvent.h"
#include <QMainWindow>
@@ -27,7 +28,6 @@
#include "GuiNativeEventLinuxX11.h"
#include "GuiApplicationNativeEventAware.h"
#include <FCConfig.h>
#include <Base/Console.h>
#include <QX11Info>

View File

@@ -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 <FCConfig.h>
#include "GuiNativeEventMac.h"
#include <unistd.h>
#include "GuiApplicationNativeEventAware.h"
#include <FCConfig.h>
#include <Base/Console.h>
UInt16 Gui::GuiNativeEvent::tdxClientID = 0;

View File

@@ -36,13 +36,13 @@ http://www.3dconnexion.com/forum/viewtopic.php?f=19&t=4968&sid=72c018bdcf0e6edc9
*/
#include "PreCompiled.h"
#include <FCConfig.h>
#include "GuiNativeEventWin32.h"
#include <QGlobalStatic>
#include <QMainWindow>
#include <QWidget>
#include <FCConfig.h>
#include <Base/Console.h>
#include "GuiApplicationNativeEventAware.h"
#if QT_VERSION >= 0x050000