diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-22 14:29:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 20:40:02 +0100 |
| commit | 553e216d891177ee0c2cea70bbd7f21103fc7795 (patch) | |
| tree | 99466d02c57215f874000b7b6c780e82112e92f1 /src/widgets/kernel/qapplication.h | |
| parent | e4e8578c350102a387aa023e7ffc3adcde3d8ae1 (diff) | |
Remove QApplication::type() and make QCoreApplication::Type internal
These Qt3 legacy application types do not match the application types
available in Qt5. Thus, the decision was to kill the confusing and
mostly useless type enum. Use for example qobject_cast instead to find
out the application type.
Task-number: QTBUG-28093
Change-Id: Ia8cf7c3ea98a3cea27f74760d62e519ea10bce9f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 3c61ffe66e..86e9638d38 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -95,16 +95,13 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication Q_PROPERTY(bool autoSipEnabled READ autoSipEnabled WRITE setAutoSipEnabled) public: - +#ifdef Q_QDOC + QApplication(int &argc, char **argv); +#else 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(); - static Type type(); - static QStyle *style(); static void setStyle(QStyle*); static QStyle *setStyle(const QString&); |