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.

Pick-to: 6.4
Change-Id: Ia4a094014ddb48cc9f6dfffd16f83a7b58ff95d3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

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;

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

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)

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();

src/widgets/kernel/qapplication.cpp

@@ -111,8 +111,8 @@ QApplicationPrivate *QApplicationPrivate::self = nullptr;
 
 bool QApplicationPrivate::autoSipEnabled = true;
 
-QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, int flags)
-    : QApplicationPrivateBase(argc, argv, flags)
+QApplicationPrivate::QApplicationPrivate(int &argc, char **argv)
+    : QApplicationPrivateBase(argc, argv)
 {
     application_type = QApplicationPrivate::Gui;
 
@@ -442,9 +442,9 @@ void QApplicationPrivate::process_cmdline()
 #ifdef Q_QDOC
 QApplication::QApplication(int &argc, char **argv)
 #else
-QApplication::QApplication(int &argc, char **argv, int _internal)
+QApplication::QApplication(int &argc, char **argv, int)
 #endif
-    : QGuiApplication(*new QApplicationPrivate(argc, argv, _internal))
+    : QGuiApplication(*new QApplicationPrivate(argc, argv))
 {
     Q_D(QApplication);
     d->init();

src/widgets/kernel/qapplication_p.h

@@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase
 {
     Q_DECLARE_PUBLIC(QApplication)
 public:
-    QApplicationPrivate(int &argc, char **argv, int flags);
+    QApplicationPrivate(int &argc, char **argv);
     ~QApplicationPrivate();
 
     virtual void notifyLayoutDirectionChange() override;