diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-27 14:17:28 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-28 10:21:46 +0200 |
| commit | 0b61f3e8b7656b3295c959ea8e54c3321167c7fa (patch) | |
| tree | 92f131ce447f75896f43d3a560a7274e46fbf92a /src/gui/kernel/qapplication.h | |
| parent | 89dfa8d7a46c992b066e5335d64089bf796e2f83 (diff) | |
Avoid sending deprecated Qt3Support events if the application was built without Qt3Support
- Detect if the application was built using Qt3Support using the QApplication's
constructor internal flags.
- Move that from QApplication to QCoreApplication.
- Do not send the event if the application was not built with Qt3Support
Reviewed-by: Brad
Diffstat (limited to 'src/gui/kernel/qapplication.h')
| -rw-r--r-- | src/gui/kernel/qapplication.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index c21b982a45..f93f24ab55 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -123,15 +123,15 @@ public: #endif #ifndef qdoc - QApplication(int &argc, char **argv, int = QT_VERSION); - QApplication(int &argc, char **argv, bool GUIenabled, int = QT_VERSION); - QApplication(int &argc, char **argv, Type, int = QT_VERSION); + QApplication(int &argc, char **argv, int = ApplicationFlags); + QApplication(int &argc, char **argv, bool GUIenabled, int = ApplicationFlags); + QApplication(int &argc, char **argv, Type, int = ApplicationFlags); #if defined(Q_WS_X11) - QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0, int = QT_VERSION); - QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0, int = QT_VERSION); + QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0, int = ApplicationFlags); + QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0, int = ApplicationFlags); #endif #if defined(Q_WS_S60) - QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv, int = QT_VERSION); + QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv, int = ApplicationFlags); #endif #endif virtual ~QApplication(); |