diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-12-15 20:27:47 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-01-31 19:09:31 +0000 |
| commit | 71b54cc24431e8bc6e97f5d62132bd5261764c3a (patch) | |
| tree | 025b00f7ab539206be61c6891700685097cfa115 | |
| parent | 14f09643441cc2938dc2791e790f6309ab12cb1d (diff) | |
QtCore & winmain: Remove dead code
The last use of qWinMain was removed in commit
390598cb4392bbf5f77e8a05578e190b1a9f544a, "Winmain: Remove Windows CE."
It used to be used on non-WinCE, but that was dropped in commit
9b121e5579538477a1fc7c8250e5d7e875a58de8.
Change-Id: Idc347fbb462f4122b044fffd1490a210358a61b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 27 | ||||
| -rw-r--r-- | src/winmain/qtmain_win.cpp | 9 |
2 files changed, 1 insertions, 35 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 67e509eeef..a9ca82c757 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -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) diff --git a/src/winmain/qtmain_win.cpp b/src/winmain/qtmain_win.cpp index 7087176110..5f90055762 100644 --- a/src/winmain/qtmain_win.cpp +++ b/src/winmain/qtmain_win.cpp @@ -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 |