diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-11 12:51:23 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-11-11 12:51:23 +0100 |
commit | 9d38dbde7663a2de8186b32e222ce8fab9cf909d (patch) | |
tree | b859ad71c3750f4cd7c2d383cc9f15cb0e0c6d7f /src/corelib/plugin | |
parent | 9b7bdd455fefc2df78eb540e9f570877aa8cd827 (diff) | |
parent | 0d02a06517f29c5b51fb2d3ac64a5e6d9daed5a9 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/qplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 4e9a60504a..c424344c3a 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -71,7 +71,7 @@ Q_DECLARE_TYPEINFO(QStaticPlugin, Q_PRIMITIVE_TYPE); void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); -#if defined (Q_OF_ELF) && (defined (Q_CC_GNU) || defined(Q_CC_CLANG)) +#if (defined(Q_OF_ELF) || defined(Q_OS_WIN)) && (defined (Q_CC_GNU) || defined(Q_CC_CLANG)) # define QT_PLUGIN_METADATA_SECTION \ __attribute__ ((section (".qtmetadata"))) __attribute__((used)) #elif defined(Q_OS_MAC) |