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

QtCore & winmain: Remove dead code

Browse Source 
The last use of qWinMain was removed in commit
390598cb43, "Winmain:  Remove Windows CE."
It used to be used on non-WinCE, but that was dropped in commit
9b121e5579.

Change-Id: Idc347fbb462f4122b044fffd1490a210358a61b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Thiago Macieira 2016-12-15 20:27:47 -08:00
parent 14f0964344
commit 71b54cc244
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/corelib/kernel/qcoreapplication_win.cpp
View File

@ -148,33 +148,6 @@ Q_CORE_EXPORT int qWinAppCmdShow() // get main window sho
}
#endif
/*****************************************************************************
qWinMain() - Initializes Windows. Called from WinMain() in qtmain_win.cpp
*****************************************************************************/
#if !defined(Q_OS_WINRT)
// ### Qt6: FIXME: Consider removing this function. It is here for Active Qt
// servers and for binary for compatibility to applications built with Qt 5.3
// using qtmain.lib which calls it In Qt 5.4, qtmain.lib was changed to use
// CommandLineToArgvW() without calling into Qt5Core.
Q_CORE_EXPORT
void qWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam,
int cmdShow, int &argc, QVector<char *> &argv)
{
Q_UNUSED(instance)
Q_UNUSED(prevInstance)
Q_UNUSED(cmdShow)
const QStringList wArgv = qWinCmdArgs(QString::fromLocal8Bit(cmdParam));
argv.clear();
argc = wArgv.size();
for (const QString &wArg : wArgv)
argv.append(_strdup(wArg.toLocal8Bit().constData()));
}
#endif // !Q_OS_WINRT
#ifndef QT_NO_QOBJECT
#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM)

9
src/winmain/qtmain_win.cpp
View File

@ -61,16 +61,9 @@
linking to the Qt DLL.
When a Windows application starts, the WinMain function is
invoked. WinMain calls qWinMain in the Qt DLL/library, which
initializes Qt.
invoked.
*/
QT_BEGIN_NAMESPACE
extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &);
QT_END_NAMESPACE
QT_USE_NAMESPACE