diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-27 12:17:28 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-28 08:21:46 (GMT) |
commit | 0b61f3e8b7656b3295c959ea8e54c3321167c7fa (patch) | |
tree | 92f131ce447f75896f43d3a560a7274e46fbf92a /src/gui/kernel/qapplication_p.h | |
parent | 89dfa8d7a46c992b066e5335d64089bf796e2f83 (diff) | |
download | Qt-0b61f3e8b7656b3295c959ea8e54c3321167c7fa.zip Qt-0b61f3e8b7656b3295c959ea8e54c3321167c7fa.tar.gz Qt-0b61f3e8b7656b3295c959ea8e54c3321167c7fa.tar.bz2 |
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_p.h')
-rw-r--r-- | src/gui/kernel/qapplication_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 01abe54..25dea1f 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -286,7 +286,7 @@ class Q_GUI_EXPORT QApplicationPrivate : public QCoreApplicationPrivate { Q_DECLARE_PUBLIC(QApplication) public: - QApplicationPrivate(int &argc, char **argv, QApplication::Type type); + QApplicationPrivate(int &argc, char **argv, QApplication::Type type, int flags); ~QApplicationPrivate(); #if defined(Q_WS_X11) @@ -483,8 +483,6 @@ public: static QString styleOverride; - static int app_compile_version; - #ifdef QT_KEYPAD_NAVIGATION static QWidget *oldEditFocus; static Qt::NavigationMode navigationMode; |