diff options
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index d4356e3e36..1ccc84b658 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -50,7 +50,7 @@ #include <QtCore/qstringlist.h> #endif -#if defined(Q_WS_WIN) && !defined(tagMSG) +#if defined(Q_OS_WIN) && !defined(tagMSG) typedef struct tagMSG MSG; #endif @@ -84,16 +84,7 @@ public: #endif }; -#if defined(QT_BUILD_CORE_LIB) || defined(qdoc) - QCoreApplication(int &argc, char **argv); // ### Qt5 remove -#endif -#if !defined(qdoc) - QCoreApplication(int &argc, char **argv, int -#if !defined(QT_BUILD_CORE_LIB) - = ApplicationFlags -#endif - ); -#endif + QCoreApplication(int &argc, char **argv, int = ApplicationFlags); ~QCoreApplication(); @@ -177,7 +168,7 @@ public: static QT3_SUPPORT int loopLevel(); #endif -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) virtual bool winEventFilter(MSG *message, long *result); #endif @@ -218,10 +209,13 @@ private: friend class QEventDispatcherUNIXPrivate; friend class QApplication; friend class QApplicationPrivate; + friend class QGuiApplication; + friend class QGuiApplicationPrivate; friend class QETWidget; friend class Q3AccelManager; friend class QShortcutMap; friend class QWidget; + friend class QWidgetWindow; friend class QWidgetPrivate; friend bool qt_sendSpontaneousEvent(QObject*, QEvent*); friend Q_CORE_EXPORT QString qAppName(); @@ -286,7 +280,7 @@ Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction); Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction); Q_CORE_EXPORT QString qAppName(); // get application name -#if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM) +#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QString decodeMSG(const MSG &); Q_CORE_EXPORT QDebug operator<<(QDebug, const MSG &); #endif |