diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2011-11-11 19:55:46 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-26 17:33:39 (GMT) |
commit | e3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52 (patch) | |
tree | 18f956cc4979ca6d91a743e2b69edce44c8300e3 /src | |
parent | 5b2ab713061b33b3bfb108c1923e9a821ad66d6e (diff) | |
download | Qt-e3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52.zip Qt-e3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52.tar.gz Qt-e3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52.tar.bz2 |
Remove the use of a template qUnused function for ICC
ICC 12 does not seem to need this.
Change-Id: I98e9d530e767c4d24424f0c2b5d763f863e85fe4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
(backported from qt5/qtbase d3951a5b0f4fe9731d1512668b43f51bd98bd84e)
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4f1384b..40bca31 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1834,7 +1834,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; } Avoid "unused parameter" warnings */ -#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT) +#if defined(Q_CC_RVCT) template <typename T> inline void qUnused(T &x) { (void)x; } # define Q_UNUSED(x) qUnused(x); |