Changeset 561 for trunk/src/winmain

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/winmain/qtmain_win.cpp (modified) (3 diffs)

trunk/src/winmain/qtmain_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Windows main function of the Qt Toolkit.
@@ -90 +91 @@
 #endif
 {
-    QByteArray cmdParam;
-    QT_WA({
-        LPTSTR cmdline = GetCommandLineW();
-        cmdParam = QString::fromUtf16((const unsigned short *)cmdline).toLocal8Bit();
-    }, {
-        cmdParam = GetCommandLineA();
-    });
+    QByteArray cmdParam = QString::fromWCharArray(GetCommandLine()).toLocal8Bit();
 
 #if defined(Q_OS_WINCE)
-    TCHAR appName[256];
-    GetModuleFileName(0, appName, 255);
-    cmdParam = QString(QLatin1String("\"%1\" ")).arg(QString::fromUtf16((const unsigned short *)appName)).toLocal8Bit() + cmdParam;
+    ];
+    GetModuleFileName(0, appName, );
+    cmdParam;
 #endif
 
@@ -109 +104 @@
 
 #if defined(Q_OS_WINCE)
-    TCHAR uniqueAppID[256];
-    GetModuleFileName(0, uniqueAppID, 255);
-    QString uid = QString::fromUtf16((const unsigned short *)uniqueAppID).toLower().replace(QString(QLatin1String("\\")), QString(QLatin1String("_")));
+    ];
+    GetModuleFileName(0, uniqueAppID, );
+    QString uid = QString::from));
 
     // If there exists an other instance of this application