summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-12-12 14:12:15 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-12 17:28:24 +0100
commit2e02aaf24c7803b672cdf815f33f3ecd48d98822 (patch)
tree6854d3807c34e0752e245fcfb5bec96c21826665 /src/corelib/kernel/qcoreapplication.h
parent1b6b1358bf2b3597747688332afc893ece2e0cfb (diff)
Make QApplication::type() set by QGuiApplication.
QApplication::type used to be static and set by the QApplicationPrivate constructors. In QCoreApplication we have the new application_type that should take its place. QApplication::GuiServer is deprecated (since it doesn't have any functionallity any more with QWS being removed). This change prepares QStyle to be called from a QQuickCanvase based application that does not inherit the QWidget version of QApplication. Change-Id: Ifbe992e25f1e5821fa047b6eb915f75fa675ab97 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
-rw-r--r--src/corelib/kernel/qcoreapplication.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 3d6aa170fd..0135d88045 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -78,6 +78,12 @@ public:
enum { ApplicationFlags = QT_VERSION
};
+ enum Type {
+ Tty,
+ GuiClient,
+ GuiServer // # deprecated
+ };
+
QCoreApplication(int &argc, char **argv, int = ApplicationFlags);
~QCoreApplication();