Raise minimum supported MSVC version to 2015

Remove code for older versions and streamline #ifdefs.

Task-number: QTBUG-51673
Change-Id: I99438ca4733e28c432e3339b7d887dc040da5a37
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 0 insertions, 21 deletions

diff --git a/src/render/renderstates/statevariant.cpp b/src/render/renderstates/statevariant.cpp
index 0db9b5a3c..e72262825 100644
--- a/src/render/renderstates/statevariant.cpp
+++ b/src/render/renderstates/statevariant.cpp
@@ -46,7 +46,6 @@ namespace Render {
 
 void StateVariant::apply(GraphicsContext *gc) const
 {
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
     switch (type) {
     case BlendEquationArgumentsMask:
         data.blendEquationArguments.apply(gc);
@@ -111,14 +110,10 @@ void StateVariant::apply(GraphicsContext *gc) const
     default:
         Q_UNREACHABLE();
     }
-#else
-    m_impl->apply(gc);
-#endif
 }
 
 RenderStateImpl *StateVariant::state()
 {
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
     switch (type) {
     case BlendEquationArgumentsMask:
     case BlendStateMask:
@@ -144,14 +139,10 @@ RenderStateImpl *StateVariant::state()
     default:
         Q_UNREACHABLE();
     }
-#else
-    return m_impl.data();
-#endif
 }
 
 const RenderStateImpl *StateVariant::constState() const
 {
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
     switch (type) {
     case BlendEquationArgumentsMask:
     case BlendStateMask:
@@ -177,9 +168,6 @@ const RenderStateImpl *StateVariant::constState() const
     default:
         Q_UNREACHABLE();
     }
-#else
-   return m_impl.data();
-#endif
 }
 
 bool StateVariant::operator ==(const StateVariant &other) const
diff --git a/src/render/renderstates/statevariant_p.h b/src/render/renderstates/statevariant_p.h
index 393e4156c..3fc93e7bd 100644
--- a/src/render/renderstates/statevariant_p.h
+++ b/src/render/renderstates/statevariant_p.h
@@ -62,7 +62,6 @@ struct Q_AUTOTEST_EXPORT StateVariant
 {
     StateMask type;
 
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
     union u_Data {
         BlendEquationArguments blendEquationArguments;
         BlendEquation blendEquation;
@@ -107,10 +106,6 @@ struct Q_AUTOTEST_EXPORT StateVariant
             // Assumes the above types don't need to have their dtor called
         }
     } data;
-#else
-    // Workaround for MSVC 2013 which doesn't support unrestricted unions
-    QSharedPointer<RenderStateImpl> m_impl;
-#endif
 
     void apply(GraphicsContext *gc) const;
 
@@ -119,13 +114,9 @@ struct Q_AUTOTEST_EXPORT StateVariant
     {
         StateVariant v;
         v.type = GenericState::type();
-#if !defined(_MSC_VER) || (_MSC_VER > 1800)
         // all union members start at the same memory address
         // so we can just write into whichever we want
         memcpy(static_cast<void *>(&v.data), static_cast<const void *>(&state), sizeof(state));
-#else
-        v.m_impl.reset(new GenericState(state));
-#endif
         return v;
     }