diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:42:02 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:45:49 +0100 |
| commit | 0d02a06517f29c5b51fb2d3ac64a5e6d9daed5a9 (patch) | |
| tree | 3426504f004cbd2fffaceec24678bb16e9abfe37 /src/corelib/plugin/qplugin.h | |
| parent | d7a5dc0cfdae2fb22b7061301575f04f2bcc3f1c (diff) | |
| parent | ba73bde66efa588a74eaaa946e80e9de2b9e2d59 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I85e3dfa62f217b76447276dd7cce6b9eac3a144e
Diffstat (limited to 'src/corelib/plugin/qplugin.h')
| -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 4e9a60504a5..c424344c3a2 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) |