diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-11-02 09:27:57 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-11-02 08:48:16 +0000 |
commit | 97b564374b99be4e3c077e6999e61d3d6688cf17 (patch) | |
tree | 24b7dd3be71474e45a8a1a9cfe154d24d6a56fa8 | |
parent | 550cd1d68c01e62b465c393b35a5f2c76b2d1fc5 (diff) | |
download | qtbase-97b564374b99be4e3c077e6999e61d3d6688cf17.tar.gz |
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 <forderud@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
-rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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<char *> &argv) |