projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1904970
)
Remove the use of a template qUnused function for ICC
author
Thiago Macieira
<thiago.macieira@intel.com>
Fri, 11 Nov 2011 19:55:46 +0000
(17:55 -0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Sun, 25 Mar 2012 21:04:08 +0000
(23:04 +0200)
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>
src/corelib/global/qglobal.h
patch
|
blob
|
history
diff --git
a/src/corelib/global/qglobal.h
b/src/corelib/global/qglobal.h
index
7d91fa3
..
cc0e6a1
100644
(file)
--- a/
src/corelib/global/qglobal.h
+++ b/
src/corelib/global/qglobal.h
@@
-820,7
+820,7
@@
Q_CORE_EXPORT bool qSharedBuild();
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);