diff options
author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 13:02:32 (GMT) |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 13:02:32 (GMT) |
commit | 304140f870fbe676888c1f3ad3fb72cc48d9751a (patch) | |
tree | 7b9e68417eefe8fadc83c5fde99ba0caf1ebedf5 | |
parent | 454d4fa2fbefabb54f7f567aaf01f2c1faa165f4 (diff) | |
parent | af134d9860d9e5af5b7e9a938191451922cea857 (diff) | |
download | Qt-304140f870fbe676888c1f3ad3fb72cc48d9751a.zip Qt-304140f870fbe676888c1f3ad3fb72cc48d9751a.tar.gz Qt-304140f870fbe676888c1f3ad3fb72cc48d9751a.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47
-rw-r--r-- | src/corelib/tools/qsimd_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 44c1798..724f3e0 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -116,11 +116,10 @@ enum CPUFeatures { NEON = 0x100 }; +Q_CORE_EXPORT uint qDetectCPUFeatures(); QT_END_NAMESPACE QT_END_HEADER -Q_CORE_EXPORT uint qDetectCPUFeatures(); - #endif // QSIMD_P_H |