From 97b564374b99be4e3c077e6999e61d3d6688cf17 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Nov 2015 09:27:57 +0100 Subject: qcoreapplication_win.cpp: Correct FIXME comment on qWinMain(). Mention that it is still used by Active Qt. Task-number: QTBUG-49148 Change-Id: Ic31b2f60b25886cd55c5fa516082d79311ab84cc Reviewed-by: Fredrik Orderud Reviewed-by: Oliver Wolff --- src/corelib/kernel/qcoreapplication_win.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qcoreapplication_win.cpp') diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 396d2f740a..324b664a1a 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -139,9 +139,10 @@ QString QCoreApplicationPrivate::appName() const #if !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) -// ### Qt6: FIXME: Remove this function. It is only there since for binary -// compatibility for 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. +// ### 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 &argv) -- cgit v1.2.3