diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-04-12 10:01:50 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-14 18:40:55 +0200 |
| commit | 94742faeceb44fd2d8131b12480e59b699b0ac6f (patch) | |
| tree | 6d39afedf893393f052b460ad480f9d4886726f4 /src/corelib/global | |
| parent | 6977700bed929c7f1a20192d07a06abc2fdca278 (diff) | |
Remove the #ifdef check just before #undef
No warning is printed anyway. This code is only for one compiler (GCC on
QNX, a.k.a. QCC).
Change-Id: I28d085c72ab5a957146efab0a36c72f213d9d2c3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 950647004a..1f82425459 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -848,12 +848,8 @@ // QNX: libcpp (Dinkumware-based) doesn't have the <initializer_list> // header, so the feature is useless, even if the compiler supports // it. Disable. -# ifdef Q_COMPILER_INITIALIZER_LISTS -# undef Q_COMPILER_INITIALIZER_LISTS -# endif -# ifdef Q_COMPILER_RVALUE_REFS -# undef Q_COMPILER_RVALUE_REFS -# endif +# undef Q_COMPILER_INITIALIZER_LISTS +# undef Q_COMPILER_RVALUE_REFS # endif # endif #endif // Q_OS_QNX |