diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index f4dfb3c2ecf..17b39036747 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -425,24 +425,7 @@ static inline bool contains(int argc, char **argv, const char *needle) #endif // Q_OS_WIN QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv) - : -#ifndef QT_NO_QOBJECT - QObjectPrivate(), -#endif - argc(aargc) - , argv(aargv) -#if defined(Q_OS_WIN) - , origArgc(0) - , origArgv(nullptr) -#endif - , application_type(QCoreApplicationPrivate::Tty) -#ifndef QT_NO_QOBJECT - , in_exec(false) - , aboutToQuitEmitted(false) - , threadData_clean(false) -#else - , q_ptr(nullptr) -#endif + : argc(aargc), argv(aargv) { static const char *const empty = ""; if (argc == 0 || argv == nullptr) { diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index aabbaf5a3f8..dce8cee1cc6 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -127,8 +127,8 @@ public: int &argc; char **argv; #if defined(Q_OS_WIN) - int origArgc; - char **origArgv; // store unmodified arguments for QCoreApplication::arguments() + int origArgc = 0; + char **origArgv = nullptr; // store unmodified arguments for QCoreApplication::arguments() bool consoleAllocated = false; #endif void appendApplicationPathToLibraryPaths(void); @@ -139,7 +139,7 @@ public: static bool isTranslatorInstalled(QTranslator *translator); #endif - QCoreApplicationPrivate::Type application_type; + Type application_type = Tty; QString cachedApplicationDirPath; static QString *cachedApplicationFilePath; @@ -149,9 +149,9 @@ public: #ifndef QT_NO_QOBJECT void execCleanup(); - bool in_exec; - bool aboutToQuitEmitted; - bool threadData_clean; + bool in_exec = false; + bool aboutToQuitEmitted = false; + bool threadData_clean = false; static QAbstractEventDispatcher *eventDispatcher; static bool is_app_running; @@ -167,7 +167,7 @@ public: inline QString qmljsDebugArgumentsString() const { return qmljs_debug_arguments; } #ifdef QT_NO_QOBJECT - QCoreApplication *q_ptr; + QCoreApplication *q_ptr = nullptr; #endif };