diff options
author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-05-19 11:35:12 +0200 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-05-19 11:45:55 +0000 |
commit | 0ace63da65a222873ecf4e966afe88afb89a25f8 (patch) | |
tree | df465128b7616c31af6762c32b3ba6a30ac65d32 /src | |
parent | f19904953538bc33897b3f65f439069d453e756f (diff) |
WinRT: fix warnings
Change-Id: If11db499d743cbe79959145ecfcbcfec896a6845
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 3 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp | 2 | ||||
-rw-r--r-- | src/imports/folderlistmodel/fileinfothread.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index f937f93025..5f7d5678ab 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -114,6 +114,9 @@ struct ExecutableAllocator { #if !OS(WINRT) DWORD oldProtect; VirtualProtect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), PAGE_EXECUTE_READWRITE, &oldProtect); +#else + (void)size; // suppress unused parameter warning + (void)roundAddr; // suppress unused parameter warning #endif #else int mode = PROT_READ | PROT_EXEC; diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp index ba251d2ecf..d684367ec6 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp @@ -55,7 +55,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo return reserveUncommitted(bytes, usage, writable, executable); } -void OSAllocator::commit(void* address, size_t bytes, bool writable, bool executable) +void OSAllocator::commit(void*, size_t, bool, bool) { CRASH(); // Unimplemented } diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp index b085233f01..e1db7834ec 100644 --- a/src/imports/folderlistmodel/fileinfothread.cpp +++ b/src/imports/folderlistmodel/fileinfothread.cpp @@ -86,6 +86,8 @@ void FileInfoThread::removePath(const QString &path) #ifndef QT_NO_FILESYSTEMWATCHER if (!path.startsWith(QLatin1Char(':'))) watcher->removePath(path); +#else + Q_UNUSED(path); #endif currentPath.clear(); } |