1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant Q_OS_BLACKBERRY define check.

Browse Source 
Q_OS_QNX is always implied by Q_OS_BLACKBERRY

Change-Id: Ic07a967ab9a45b3c6c088aa8399bab823b9a413e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Rafael Roquetto 2013-01-02 17:28:43 -02:00 committed by The Qt Project
parent cc69dff01b
commit faaaa68db4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qcompilerdetection.h
View File

@ -693,7 +693,7 @@
#endif /* Q_CC_MSVC */ #endif /* Q_CC_MSVC */
#ifdef __cplusplus #ifdef __cplusplus
# if defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) # if defined(Q_OS_QNX)
# include <utility> # include <utility>
# if defined(_YVALS) || defined(_LIBCPP_VER) # if defined(_YVALS) || defined(_LIBCPP_VER)
// QNX: libcpp (Dinkumware-based) doesn't have the <initializer_list> // QNX: libcpp (Dinkumware-based) doesn't have the <initializer_list>
@ -704,7 +704,7 @@
# endif # endif
# endif # endif
# endif # endif
#endif // Q_OS_BLACKBERRY || Q_OS_QNX #endif // Q_OS_QNX
/* /*
* C++11 keywords and expressions * C++11 keywords and expressions