diff options
Diffstat (limited to 'src/gui/guikernel/qguiapplication.h')
| -rw-r--r-- | src/gui/guikernel/qguiapplication.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/guikernel/qguiapplication.h b/src/gui/guikernel/qguiapplication.h index f1ac01dcfc..980e275a61 100644 --- a/src/gui/guikernel/qguiapplication.h +++ b/src/gui/guikernel/qguiapplication.h @@ -57,6 +57,16 @@ QT_MODULE(Gui) class QGuiApplicationPrivate; class QPlatformNativeInterface; +#if defined(qApp) +#undef qApp +#endif +#define qApp (static_cast<QGuiApplication *>(QCoreApplication::instance())) + +#if defined(qGuiApp) +#undef qGuiApp +#endif +#define qGuiApp (static_cast<QGuiApplication *>(QCoreApplication::instance())) + class Q_GUI_EXPORT QGuiApplication : public QCoreApplication { Q_OBJECT @@ -68,14 +78,12 @@ public: QGuiApplication(int &argc, char **argv, int = ApplicationFlags); virtual ~QGuiApplication(); -#if 0 #ifndef QT_NO_CURSOR static QCursor *overrideCursor(); static void setOverrideCursor(const QCursor &); static void changeOverrideCursor(const QCursor &); static void restoreOverrideCursor(); #endif -#endif static QFont font(); static void setFont(const QFont &); |