diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-12 08:24:56 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-12 08:24:56 (GMT) |
| commit | d7d6bef4916c35bc98a84bba2527b678547d043a (patch) | |
| tree | ee4e2500846e8de597ff39333106c61fd0adcc34 /src | |
| parent | d45c0d3930e295e9798f9172fa0f151044f7036b (diff) | |
| download | Qt-d7d6bef4916c35bc98a84bba2527b678547d043a.zip Qt-d7d6bef4916c35bc98a84bba2527b678547d043a.tar.gz Qt-d7d6bef4916c35bc98a84bba2527b678547d043a.tar.bz2 | |
Compile fix for WinCE
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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<char>(cmdParam, int(strlen(cmdParam)), argc); + appCmdShow = cmdShow; + // Ignore Windows parameters Q_UNUSED(instance); Q_UNUSED(prevInstance); - Q_UNUSED(cmdShow); } /*! |