MinGW: Fix warnings.
- Special #define to access HB seems no longer necessary (it was causing about mismatching DLL import attributes). Change-Id: I57cc7d57b12a67c1d549b053db81e1f198f87786 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
19f4b47b45
commit
3f75fb8d8f
@ -98,7 +98,7 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe)
|
||||
break;
|
||||
DWORD dwError = GetLastError();
|
||||
if (dwError != ERROR_PIPE_BUSY || !--attempts) {
|
||||
qErrnoWarning(dwError, "QProcess: CreateNamedPipe failed.", GetLastError());
|
||||
qErrnoWarning(dwError, "QProcess: CreateNamedPipe failed.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -115,7 +115,7 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe)
|
||||
FILE_FLAG_OVERLAPPED,
|
||||
NULL);
|
||||
if (hWrite == INVALID_HANDLE_VALUE) {
|
||||
qWarning("QProcess: CreateFile failed with error code %d.\n", GetLastError());
|
||||
qErrnoWarning("QProcess: CreateFile failed.");
|
||||
CloseHandle(hRead);
|
||||
return;
|
||||
}
|
||||
|
@ -84,7 +84,7 @@ public:
|
||||
: hPort(INVALID_HANDLE_VALUE)
|
||||
{
|
||||
setObjectName(QLatin1String("I/O completion port thread"));
|
||||
HANDLE hIOCP = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, NULL, 0);
|
||||
HANDLE hIOCP = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
|
||||
if (!hIOCP) {
|
||||
qErrnoWarning("CreateIoCompletionPort failed.");
|
||||
return;
|
||||
@ -94,7 +94,7 @@ public:
|
||||
|
||||
~QWinIoCompletionPort()
|
||||
{
|
||||
PostQueuedCompletionStatus(hPort, 0, NULL, NULL);
|
||||
PostQueuedCompletionStatus(hPort, 0, 0, NULL);
|
||||
QThread::wait();
|
||||
CloseHandle(hPort);
|
||||
}
|
||||
|
@ -108,8 +108,8 @@ void QLocalSocketPrivate::_q_winError(ulong windowsError, const QString &functio
|
||||
|
||||
QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(),
|
||||
handle(INVALID_HANDLE_VALUE),
|
||||
pipeReader(0),
|
||||
pipeWriter(0),
|
||||
pipeReader(0),
|
||||
error(QLocalSocket::UnknownSocketError),
|
||||
state(QLocalSocket::UnconnectedState)
|
||||
{
|
||||
|
@ -732,6 +732,8 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port)
|
||||
ipv6only = 1;
|
||||
ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) );
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(ipv6only)
|
||||
#endif
|
||||
break;
|
||||
case QAbstractSocket::IPv4Protocol:
|
||||
|
@ -53,10 +53,7 @@
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
// Enable access to HB_Face in harfbuzz includes included by qfontengine_p.h.
|
||||
#define QT_BUILD_GUI_LIB
|
||||
#include <QtGui/private/qfontengine_p.h>
|
||||
#undef QT_BUILD_GUI_LIB
|
||||
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
Loading…
Reference in New Issue
Block a user