diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 13:30:06 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 14:38:09 (GMT) |
| commit | d71f6a8c0c9c089d3fe18846835ee183aab47ae9 (patch) | |
| tree | 2842e8adecb17b57ebb7854466b4536bd2f38e10 | |
| parent | 21052c1ad0a670ab746298569c3a90720741a0ce (diff) | |
| download | Qt-d71f6a8c0c9c089d3fe18846835ee183aab47ae9.zip Qt-d71f6a8c0c9c089d3fe18846835ee183aab47ae9.tar.gz Qt-d71f6a8c0c9c089d3fe18846835ee183aab47ae9.tar.bz2 | |
Fix warnings in mingw
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_win.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 794b2b7..3a36ac0 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -514,7 +514,7 @@ bool QLocalSocket::waitForReadyRead(int msecs) return false; } - qWarning("QLocalSocket::waitForReadyRead WaitForSingleObject failed with error code %d.", GetLastError()); + qWarning("QLocalSocket::waitForReadyRead WaitForSingleObject failed with error code %d.", int(GetLastError())); return false; } diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index 400b3bc..232d47b 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -1413,7 +1413,7 @@ void QGLWidget::setContext(QGLContext *context, } if (!d->glcx->isValid()) { - bool wasSharing = shareContext || oldcx && oldcx->isSharing(); + bool wasSharing = shareContext || (oldcx && oldcx->isSharing()); d->glcx->create(shareContext ? shareContext : oldcx); // the above is a trick to keep disp lists etc when a // QGLWidget has been reparented, so remove the sharing |