From e03b77d1a6eb58664faa9abd38f9aa3750a25198 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 31 Jan 2012 12:17:32 +0100 Subject: Remove the API duplication from QApplication. The quitOnLastWindowClosed API is present in the base class QGuiApplication. Change-Id: Ib2f78e48a198aa835302dcb9a31637a2c3655532 Reviewed-by: Jonas Gastal Reviewed-by: David Faure --- src/widgets/kernel/qapplication.cpp | 50 ------------------------------------- src/widgets/kernel/qapplication.h | 5 ---- 2 files changed, 55 deletions(-) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index b0781c2064..cb6a8c1e7c 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2101,29 +2101,6 @@ void QApplication::aboutQt() #endif // QT_NO_MESSAGEBOX } - -/*! - \fn void QApplication::lastWindowClosed() - - This signal is emitted from QApplication::exec() when the last visible - primary window (i.e. window with no parent) with the Qt::WA_QuitOnClose - attribute set is closed. - - By default, - - \list - \o this attribute is set for all widgets except transient windows such - as splash screens, tool windows, and popup menus - - \o QApplication implicitly quits when this signal is emitted. - \endlist - - This feature can be turned off by setting \l quitOnLastWindowClosed to - false. - - \sa QWidget::close() -*/ - /*! \since 4.1 \fn void QApplication::focusChanged(QWidget *old, QWidget *now) @@ -4598,33 +4575,6 @@ bool QApplicationPrivate::inPopupMode() const return QApplicationPrivate::popupWidgets != 0; } -/*! - \property QApplication::quitOnLastWindowClosed - - \brief whether the application implicitly quits when the last window is - closed. - - The default is true. - - If this property is true, the applications quits when the last visible - primary window (i.e. window with no parent) with the Qt::WA_QuitOnClose - attribute set is closed. By default this attribute is set for all widgets - except for sub-windows. Refer to \l{Qt::WindowType} for a detailed list of - Qt::Window objects. - - \sa quit(), QWidget::close() - */ - -void QApplication::setQuitOnLastWindowClosed(bool quit) -{ - QCoreApplication::setQuitLockEnabled(quit); -} - -bool QApplication::quitOnLastWindowClosed() -{ - return QCoreApplication::isQuitLockEnabled(); -} - /*! \variable QApplication::NormalColors \compat diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index ee651394b8..ace557bfb7 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -87,7 +87,6 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication Q_PROPERTY(QSize globalStrut READ globalStrut WRITE setGlobalStrut) Q_PROPERTY(int startDragTime READ startDragTime WRITE setStartDragTime) Q_PROPERTY(int startDragDistance READ startDragDistance WRITE setStartDragDistance) - Q_PROPERTY(bool quitOnLastWindowClosed READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed) #ifndef QT_NO_STYLE_STYLESHEET Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet) #endif @@ -231,10 +230,6 @@ public: static int exec(); bool notify(QObject *, QEvent *); - - static void setQuitOnLastWindowClosed(bool quit); - static bool quitOnLastWindowClosed(); - #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); static bool keypadNavigationEnabled(); -- cgit v1.2.3