summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
-rw-r--r--src/widgets/kernel/qapplication.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 206692e6d4..4aac97aece 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -97,7 +97,9 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication
public:
QApplication(int &argc, char **argv, int = ApplicationFlags);
+#ifdef QT_DEPRECATED
QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled, int = ApplicationFlags);
+#endif
QApplication(int &argc, char **argv, Type, int = ApplicationFlags);
virtual ~QApplication();
@@ -145,7 +147,9 @@ public:
static QWidget *topLevelAt(const QPoint &p);
static inline QWidget *topLevelAt(int x, int y) { return topLevelAt(QPoint(x, y)); }
- QT_DEPRECATED static void syncX();
+#if QT_DEPRECATED_SINCE(5, 0)
+ QT_DEPRECATED static inline void syncX() {}
+#endif
static void beep();
static void alert(QWidget *widget, int duration = 0);
@@ -182,8 +186,12 @@ public:
virtual void saveState(QSessionManager& sm);
#endif
- QT_DEPRECATED static QLocale keyboardInputLocale();
- QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
+#if QT_DEPRECATED_SINCE(5, 0)
+ QT_DEPRECATED static QLocale keyboardInputLocale()
+ { return qApp ? qApp->inputMethod()->locale() : QLocale::c(); }
+ QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection()
+ { return qApp ? qApp->inputMethod()->inputDirection() : Qt::LeftToRight; }
+#endif
static int exec();
bool notify(QObject *, QEvent *);