From d7d6bef4916c35bc98a84bba2527b678547d043a Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 12 Apr 2010 10:24:56 +0200 Subject: Compile fix for WinCE --- src/corelib/kernel/qcoreapplication_win.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 040b2cc..320f801 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE bool usingWinMain = false; // whether the qWinMain() is used or not +int appCmdShow = 0; Q_CORE_EXPORT HINSTANCE qWinAppInst() // get Windows app handle { @@ -66,12 +67,16 @@ Q_CORE_EXPORT HINSTANCE qWinAppPrevInst() // get Windows prev app Q_CORE_EXPORT int qWinAppCmdShow() // get main window show command { +#if defined(Q_OS_WINCE) + return appCmdShow; +#else STARTUPINFO startupInfo; GetStartupInfo(&startupInfo); return (startupInfo.dwFlags & STARTF_USESHOWWINDOW) ? startupInfo.wShowWindow : SW_SHOWDEFAULT; +#endif } Q_CORE_EXPORT QString qAppFileName() // get application file name @@ -185,10 +190,11 @@ void qWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, // Create command line argv = qWinCmdLine(cmdParam, int(strlen(cmdParam)), argc); + appCmdShow = cmdShow; + // Ignore Windows parameters Q_UNUSED(instance); Q_UNUSED(prevInstance); - Q_UNUSED(cmdShow); } /*! -- cgit v0.12