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/gui | |
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/gui')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 8 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a8ec2c0540..274342792f 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -621,9 +621,9 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME #ifdef Q_QDOC QGuiApplication::QGuiApplication(int &argc, char **argv) #else -QGuiApplication::QGuiApplication(int &argc, char **argv, int flags) +QGuiApplication::QGuiApplication(int &argc, char **argv, int) #endif - : QCoreApplication(*new QGuiApplicationPrivate(argc, argv, flags)) + : QCoreApplication(*new QGuiApplicationPrivate(argc, argv)) { d_func()->init(); @@ -686,8 +686,8 @@ QGuiApplication::~QGuiApplication() QGuiApplicationPrivate::tabletDevicePoints.clear(); } -QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags) - : QCoreApplicationPrivate(argc, argv, flags), +QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv) + : QCoreApplicationPrivate(argc, argv), inputMethod(nullptr), lastTouchType(QEvent::TouchEnd), ownGlobalShareContext(false) diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index cc8b6a206c..72a3fc78d0 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -57,7 +57,7 @@ class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate { Q_DECLARE_PUBLIC(QGuiApplication) public: - QGuiApplicationPrivate(int &argc, char **argv, int flags); + QGuiApplicationPrivate(int &argc, char **argv); ~QGuiApplicationPrivate(); void init(); |