Make QApplication::type() set by QGuiApplication.
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Mon, 12 Dec 2011 13:12:15 +0000 (14:12 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 12 Dec 2011 16:28:24 +0000 (17:28 +0100)
commit2e02aaf24c7803b672cdf815f33f3ecd48d98822
tree6854d3807c34e0752e245fcfb5bec96c21826665
parent1b6b1358bf2b3597747688332afc893ece2e0cfb
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>
src/corelib/kernel/qcoreapplication.cpp
src/corelib/kernel/qcoreapplication.h
src/gui/kernel/qguiapplication.cpp
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qapplication.h