From fb71c823a7ae823345518ca33ccfe273fcf76494 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Mon, 10 Jul 2017 21:44:37 -0700
Subject: [PATCH] Remove workaround for unsupported compiler
Qt for WinRT now requires Visual Studio 2015.
Change-Id: I8996f2855476315819532df89c6754aa162bd02e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
src/websockets/qwebsocketframe.cpp | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp
index d51ae7cd..3be3d284 100644
--- a/src/websockets/qwebsocketframe.cpp
+++ b/src/websockets/qwebsocketframe.cpp
@@ -286,13 +286,6 @@ bool QWebSocketFrame::isValid() const
return m_isValid;
}
-// The arm compiler of Visual Studio 2013 Update 3 crashes when
-// trying to optimize QWebSocketFrame::readFrame. Hence turn
-// those off for this snippet
-#if defined(Q_OS_WINRT) && defined(__ARM__)
-# pragma optimize("", off)
-#endif
-
#define WAIT_FOR_MORE_DATA(dataSizeInBytes) \
{ returnState = processingState; \
processingState = PS_WAIT_FOR_MORE_DATA; dataWaitSize = dataSizeInBytes; }
@@ -501,10 +494,6 @@ QWebSocketFrame QWebSocketFrame::readFrame(QIODevice *pIoDevice)
return frame;
}
-#if defined(Q_OS_WINRT) && defined(__ARM__)
-# pragma optimize("", on)
-#endif
-
/*!
\internal
*/
--
GitLab