diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:25:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 14:03:14 +0200 |
| commit | fdb6d8370f9ae8fa148124289317c108399853c3 (patch) | |
| tree | 032df3423d24599d99700cda7dae8d67f6803068 /src | |
| parent | b73b3f8a5cb566ff8219b14647f0ceae29cfe6b2 (diff) | |
| parent | fb71c823a7ae823345518ca33ccfe273fcf76494 (diff) | |
| download | qtwebsockets-fdb6d8370f9ae8fa148124289317c108399853c3.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I3dd9c568ed9160510bff527355ecfbed5d4690a9
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsocketframe.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp index d51ae7c..3be3d28 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 */ |