diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-13 09:19:24 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-14 00:58:39 +0000 |
| commit | 478d48eb6dc18bbd5b9601e83110d22f115db130 (patch) | |
| tree | c3ce40aac632a0bb06fc979846e65e3e97f99085 /src/corelib | |
| parent | c6f9ab3c0787a01052d4a1781932d861f6fd1993 (diff) | |
Q*ApplicationPrivate: remove unused "flags" arguments
They weren't flags. They were the version of Qt that was used in
compiling the application itself. The protection against rollback isn't
necessary any more, since qversiontagging.h, which applies to everything
and not just the main application binary. And using them to make
decisions on functionality or behavior is misguided (see previous
commit).
This commit does not deprecate the front-end classes' argument. In the
future, we may find some need for them.
Change-Id: Ia4a094014ddb48cc9f6dfffd16f83a7b58ff95d3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fb1e0eee078f3f797a72b38e6981348b5ae5810c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index eb5945b5ae..4d69ca9a17 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -393,7 +393,7 @@ static inline bool contains(int argc, char **argv, const char *needle) } #endif // Q_OS_WIN -QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint) +QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv) : #ifndef QT_NO_QOBJECT QObjectPrivate(), @@ -707,13 +707,13 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p) */ QCoreApplication::QCoreApplication(int &argc, char **argv #ifndef Q_QDOC - , int _internal + , int #endif ) #ifdef QT_NO_QOBJECT - : d_ptr(new QCoreApplicationPrivate(argc, argv, _internal)) + : d_ptr(new QCoreApplicationPrivate(argc, argv)) #else - : QObject(*new QCoreApplicationPrivate(argc, argv, _internal)) + : QObject(*new QCoreApplicationPrivate(argc, argv)) #endif { d_func()->q_ptr = this; diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index b5621f1de6..94c4b0f1e9 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -56,7 +56,7 @@ public: Gui }; - QCoreApplicationPrivate(int &aargc, char **aargv, uint); + QCoreApplicationPrivate(int &aargc, char **aargv); // If not inheriting from QObjectPrivate: force this class to be polymorphic #ifdef QT_NO_QOBJECT |