From 069228f96a795a9428b28cb51c86d16f01b6372f Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Fri, 23 Feb 2024 14:59:08 +0800 Subject: [PATCH] Qt5.6.2: Q_OS_WIN --- Src/FactoryFace.cpp | 4 ++-- Src/ImageTool.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/FactoryFace.cpp b/Src/FactoryFace.cpp index 56b2773..572e3b0 100644 --- a/Src/FactoryFace.cpp +++ b/Src/FactoryFace.cpp @@ -27,7 +27,7 @@ CFactoryFace::CFactoryFace(QObject *parent): QObject(parent), szPath = szPath + QDir::separator() + "Face"; #endif QStringList filters; -#if defined (Q_OS_WINDOWS) +#if defined (Q_OS_WINDOWS) || defined(Q_OS_WIN) filters << "*PluginFace*.dll"; #else filters << "*PluginFace*.so"; @@ -393,7 +393,7 @@ int CFactoryFace::FindPlugins(QDir dir, QStringList filters) QString fileName; if(filters.isEmpty()) { -#if defined (Q_OS_WINDOWS) +#if defined (Q_OS_WINDOWS) || defined(Q_OS_WIN) filters << "*PluginFace*.dll"; #else filters << "*PluginFace*.so"; diff --git a/Src/ImageTool.cpp b/Src/ImageTool.cpp index 1f83b6b..3e839fb 100644 --- a/Src/ImageTool.cpp +++ b/Src/ImageTool.cpp @@ -38,7 +38,7 @@ CImageTool::CImageTool(QObject *parent) : QObject(parent), m_pConverFormat(nullp szPath = szPath + QDir::separator() + "ConverFormat"; #endif QStringList filters; -#if defined (Q_OS_WINDOWS) +#if defined (Q_OS_WINDOWS) || defined(Q_OS_WIN) filters << "*PluginConverFormat*.dll"; #else filters << "*PluginConverFormat*.so"; @@ -314,7 +314,7 @@ int CImageTool::FindPlugins(QDir dir, QStringList filters) QString fileName; if(filters.isEmpty()) { -#if defined (Q_OS_WINDOWS) +#if defined (Q_OS_WINDOWS) || defined(Q_OS_WIN) filters << "*.dll"; #else filters << "*.so";