updated mingw-w64-qt5-base-opengl
This commit is contained in:
parent
b70ddf7c97
commit
c4c4b89e42
|
@ -0,0 +1,16 @@
|
|||
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
|
||||
index c1956ae..76c2f57 100644
|
||||
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
|
||||
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
|
||||
@@ -1679,8 +1679,9 @@ void QNetworkReplyHttpImplPrivate::_q_startOperation()
|
||||
#endif
|
||||
} else {
|
||||
#ifndef QT_NO_BEARERMANAGEMENT
|
||||
- QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
|
||||
- q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
|
||||
+ if (session)
|
||||
+ QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
|
||||
+ q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
|
||||
#endif
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
@@ -4456,7 +4456,7 @@
|
||||
if compileTest unix/ipc_posix "ipc_posix" ; then
|
||||
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
|
||||
else
|
||||
- if [ "$XPLATFORM_ANDROID" = "no" ] ; then
|
||||
+ if [ "$XPLATFORM_ANDROID" = "no"] && ["$XPLATFORM_MINGW" = "no" ] ; then
|
||||
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
|
||||
fi
|
||||
fi
|
Loading…
Reference in New Issue