diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
| commit | 00ef07fe96f51cb309469454592daf5d4a92eb4b (patch) | |
| tree | 59f34f603882644ba25fb4bbc893fcb64ea6b262 /src/corelib/global/qglobal.h | |
| parent | f05236a40d7ee9299c5855d70e542143a2d342c8 (diff) | |
| parent | 7b6c3707dea3292b62cca02245a710f00db21427 (diff) | |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qwslock.cpp
src/plugins/decorations/default/default.pro
src/plugins/decorations/styled/styled.pro
src/plugins/decorations/windows/windows.pro
src/plugins/gfxdrivers/ahi/ahi.pro
src/plugins/gfxdrivers/directfb/directfb.pro
src/plugins/gfxdrivers/eglnullws/eglnullws.pro
src/plugins/gfxdrivers/linuxfb/linuxfb.pro
src/plugins/gfxdrivers/qvfb/qvfb.pro
src/plugins/gfxdrivers/transformed/transformed.pro
src/plugins/gfxdrivers/vnc/vnc.pro
src/plugins/graphicssystems/meego/meego.pro
src/plugins/graphicssystems/opengl/opengl.pro
src/plugins/graphicssystems/openvg/openvg.pro
src/plugins/graphicssystems/shivavg/shivavg.pro
src/plugins/graphicssystems/trace/trace.pro
src/plugins/kbddrivers/linuxinput/linuxinput.pro
src/plugins/mousedrivers/linuxtp/linuxtp.pro
src/plugins/mousedrivers/pc/pc.pro
src/plugins/mousedrivers/tslib/tslib.pro
src/plugins/platforms/minimal/minimal.pro
tests/auto/qerrormessage/qerrormessage.pro
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index fda58336eb..79defc4277 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -425,14 +425,11 @@ namespace QT_NAMESPACE {} #if defined(Q_CC_MSVC) && _MSC_VER >= 1600 # define Q_COMPILER_RVALUE_REFS -# define Q_COMPILER_INITIALIZER_LISTS # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_LAMBDA -//# define Q_COMPILER_VARIADIC_TEMPLATES -//# define Q_COMPILER_CLASS_ENUM -//# define Q_COMPILER_DEFAULT_DELETE_MEMBERS -//# define Q_COMPILER_UNICODE_STRINGS -//# define Q_COMPILER_EXTERN_TEMPLATES +# define Q_COMPILER_DECLTYPE +// MSCV has std::initilizer_list, but do not support the braces initialization +//# define Q_COMPILER_INITIALIZER_LISTS # endif @@ -524,6 +521,7 @@ namespace QT_NAMESPACE {} # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403 /* C++0x features supported in GCC 4.3: */ # define Q_COMPILER_RVALUE_REFS +# define Q_COMPILER_DECLTYPE # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 /* C++0x features supported in GCC 4.4: */ @@ -791,6 +789,7 @@ namespace QT_NAMESPACE {} # if __INTEL_COMPILER >= 1100 # define Q_COMPILER_RVALUE_REFS # define Q_COMPILER_EXTERN_TEMPLATES +# define Q_COMPILER_DECLTYPE # elif __INTEL_COMPILER >= 1200 # define Q_COMPILER_VARIADIC_TEMPLATES # define Q_COMPILER_AUTO_TYPE @@ -2792,6 +2791,12 @@ QT_LICENSED_MODULE(Sensors) # define QT_NO_RAWFONT #endif +namespace QtPrivate { +//like std::enable_if +template <bool B, typename T = void> struct QEnableIf; +template <typename T> struct QEnableIf<true, T> { typedef T Type; }; +} + QT_END_NAMESPACE QT_END_HEADER |