From 924bd66e849640d9aa326b18a880bea7a01dfeb9 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Mon, 8 Jan 2018 12:00:14 +0800 Subject: [PATCH] fix linux build --- src/core/qqtcore.h | 13 +++++++++++++ src/core/qqtobjectfactory.h | 1 + src/qqt.h | 11 ----------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/core/qqtcore.h b/src/core/qqtcore.h index 2ecaab89..53980f6c 100644 --- a/src/core/qqtcore.h +++ b/src/core/qqtcore.h @@ -16,8 +16,21 @@ #include #include #include "qglobal.h" +#include "qqt-qt.h" #include +#if defined(__WIN32__) || defined(__WIN64__) +#include "qqtwin.h" +#elif defined(__LINUX__) || defined(__LINUX64__) \ + || defined(__EMBEDDED_LINUX__) \ + || defined(__ARM_LINUX__) || defined(__MIPS_LINUX__) +#include "qqtlinux.h" +#elif defined (__ANDROID__) || defined (__ANDROIDX86__) +#include "qqtandroid.h" +#elif defined (__DARWIN__) || defined(__IOS__) +#include "qqtdarwin.h" +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/src/core/qqtobjectfactory.h b/src/core/qqtobjectfactory.h index 2146338b..6c6315b3 100644 --- a/src/core/qqtobjectfactory.h +++ b/src/core/qqtobjectfactory.h @@ -9,6 +9,7 @@ #include #include #include "qqt-local.h" +#include "qqtcore.h" #if 0 class QQTSHARED_EXPORT QQtConstructer : public QObject diff --git a/src/qqt.h b/src/qqt.h index 95b75145..0a277fb0 100644 --- a/src/qqt.h +++ b/src/qqt.h @@ -7,17 +7,6 @@ #include "qqt-local.h" #include "qqt-qt.h" -#if defined(__WIN32__) || defined(__WIN64__) -#include "qqtwin.h" -#elif defined(__LINUX__) || defined(__LINUX64__) \ - || defined(__EMBEDDED_LINUX__) \ - || defined(__ARM_LINUX__) || defined(__MIPS_LINUX__) -#include "qqtlinux.h" -#elif defined (__ANDROID__) || defined (__ANDROIDX86__) -#include "qqtandroid.h" -#elif defined (__DARWIN__) || defined(__IOS__) -#include "qqtdarwin.h" -#endif #include "qqtcore.h" #include "qqtgui.h" #include "qqtsql.h"