From 376e4ea0aec9e6451b8e7301d8d204042476ceb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= Date: Sat, 4 Aug 2018 18:13:49 +0200 Subject: [PATCH] WIP: MSVC compatibility for pymod module. --- src/gsiqt/qtbasic/gsiQtGuiExternals.h | 2 -- src/gsiqt/qtbasic/gsiQtWidgetsExternals.h | 1 - src/laybasic/laybasic/gsiDeclLayDialogs.cc | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gsiqt/qtbasic/gsiQtGuiExternals.h b/src/gsiqt/qtbasic/gsiQtGuiExternals.h index 924bd51b4..2773c3da4 100644 --- a/src/gsiqt/qtbasic/gsiQtGuiExternals.h +++ b/src/gsiqt/qtbasic/gsiQtGuiExternals.h @@ -21,9 +21,7 @@ */ #if QT_VERSION >= 0x050000 -# include "../qt5/QtGui/gsiDeclQtGuiTypeTraits.h" # include "../qt5/QtGui/gsiQtExternals.h" #else -# include "../qt4/QtGui/gsiDeclQtGuiTypeTraits.h" # include "../qt4/QtGui/gsiQtExternals.h" #endif diff --git a/src/gsiqt/qtbasic/gsiQtWidgetsExternals.h b/src/gsiqt/qtbasic/gsiQtWidgetsExternals.h index 118040b22..5188b45a6 100644 --- a/src/gsiqt/qtbasic/gsiQtWidgetsExternals.h +++ b/src/gsiqt/qtbasic/gsiQtWidgetsExternals.h @@ -21,7 +21,6 @@ */ #if QT_VERSION >= 0x050000 -# include "../qt5/QtWidgets/gsiDeclQtWidgetsTypeTraits.h" # include "../qt5/QtWidgets/gsiQtExternals.h" #else // no present in Qt4 diff --git a/src/laybasic/laybasic/gsiDeclLayDialogs.cc b/src/laybasic/laybasic/gsiDeclLayDialogs.cc index f64e14598..757376db9 100644 --- a/src/laybasic/laybasic/gsiDeclLayDialogs.cc +++ b/src/laybasic/laybasic/gsiDeclLayDialogs.cc @@ -34,8 +34,8 @@ #include #if defined(HAVE_QTBINDINGS) -# include "gsiQtGuiExternals.h" -# include "gsiQtWidgetsExternals.h" +# include "gsiQtGuiExternals.h" +# include "gsiQtWidgetsExternals.h" FORCE_LINK_GSI_QTGUI FORCE_LINK_GSI_QTWIDGETS // for Qt5