diff options
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index cfd40306c7..bfd65d2c9a 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -25,6 +25,7 @@ #include "QtCore/qsettings.h" #endif #ifndef QT_NO_QOBJECT +#include <qloggingcategory.h> #include "private/qobject_p.h" #include "private/qlocking_p.h" #endif @@ -35,6 +36,10 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_QOBJECT +Q_DECLARE_LOGGING_CATEGORY(lcDeleteLater) +#endif + typedef QList<QTranslator*> QTranslatorList; class QAbstractEventDispatcher; @@ -56,7 +61,7 @@ public: Gui }; - QCoreApplicationPrivate(int &aargc, char **aargv, uint flags); + QCoreApplicationPrivate(int &aargc, char **aargv); // If not inheriting from QObjectPrivate: force this class to be polymorphic #ifdef QT_NO_QOBJECT @@ -73,6 +78,7 @@ public: static QString infoDictionaryStringProperty(const QString &propertyName); #endif + void initConsole(); static void initLocale(); static bool checkInstance(const char *method); @@ -102,6 +108,7 @@ public: virtual void quit(); static QBasicAtomicPointer<QThread> theMainThread; + static QBasicAtomicPointer<void> theMainThreadId; static QThread *mainThread(); static bool threadRequiresCoreApplication(); @@ -125,6 +132,7 @@ public: #if defined(Q_OS_WIN) int origArgc; char **origArgv; // store unmodified arguments for QCoreApplication::arguments() + bool consoleAllocated = false; #endif void appendApplicationPathToLibraryPaths(void); @@ -156,7 +164,6 @@ public: static bool setuidAllowed; static uint attribs; static inline bool testAttribute(uint flag) { return attribs & (1 << flag); } - static int app_compile_version; void processCommandLineArguments(); QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging. |