AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with MinGW-w64

Browse Source 
This fixes a "cast from 'void*' to 'int' loses precision" error and adds
a missing argument to qWarning.

Change-Id: I38544c4e317a3f6d1ecf26ebb3e35c66b1878d24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Jonathan Liu 2012-02-19 22:33:35 +11:00 committed by Qt by Nokia
parent 3cb078a23c
commit 7d8f5777be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/windows/qwindowsservices.cpp
View File

@ -54,10 +54,10 @@ enum { debug = 0 };
static inline bool shellExecute(const QString &file) static inline bool shellExecute(const QString &file)
{ {
const int result = (int)ShellExecute(0, 0, (wchar_t*)file.utf16(), 0, 0, SW_SHOWNORMAL); const quintptr result = (quintptr)ShellExecute(0, 0, (wchar_t*)file.utf16(), 0, 0, SW_SHOWNORMAL);
// ShellExecute returns a value greater than 32 if successful // ShellExecute returns a value greater than 32 if successful
if (result <= 32) { if (result <= 32) {
qWarning("ShellExecute '%s' failed (error %0x).", qPrintable(file), result); qWarning("ShellExecute '%s' failed (error %s).", qPrintable(file), qPrintable(QString::number(result)));
return false; return false;
} }
return true; return true;
@ -104,7 +104,7 @@ static inline bool launchMail(const QUrl &url)
{ {
QString command = mailCommand(); QString command = mailCommand();
if (command.isEmpty()) { if (command.isEmpty()) {
qWarning("Cannot launch '%s': There is no mail program installed."); qWarning("Cannot launch '%s': There is no mail program installed.", qPrintable(url.toString()));
return false; return false;
} }
//Make sure the path for the process is in quotes //Make sure the path for the process is in quotes