FCL/sf/mw/qt: comparison src/gui/kernel/qapplication.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 #include "private/qstylesheetstyle_p.h"
 #include "private/qstyle_p.h"
 #include "qmessagebox.h"
 #include <QtGui/qgraphicsproxywidget.h>
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+#include "private/qgraphicssystem_runtime_p.h"
+#endif
 #include "qinputcontext.h"
 #include "qkeymapper_p.h"
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
 #endif
-#if defined(Q_WS_X11) || defined(Q_WS_S60)
+#if defined(Q_WS_X11) || defined(Q_OS_SYMBIAN)
 #include "qinputcontextfactory.h"
 #endif
 #include "qguiplatformplugin_p.h"
 }
 QT_BEGIN_NAMESPACE
-Q_DECL_IMPORT extern void qt_call_post_routines();
+Q_CORE_EXPORT void qt_call_post_routines();
 int QApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly, but it's at least 4.0.0
 QApplication::Type qt_appType=QApplication::Tty;
 QApplicationPrivate *QApplicationPrivate::self = 0;
 #endif
 #if defined(Q_WS_QWS) && !defined(QT_NO_DIRECTPAINTER)
 directPainters = 0;
 #endif
+#ifndef QT_NO_GESTURES
 gestureManager = 0;
 gestureWidget = 0;
+#endif // QT_NO_GESTURES
 #if defined(Q_WS_X11) || defined(Q_WS_WIN)
 move_cursor = 0;
 copy_cursor = 0;
 link_cursor = 0;
 QPalette *QApplicationPrivate::sys_pal = 0;        // default system palette
 QPalette *QApplicationPrivate::set_pal = 0;        // default palette set by programmer
 QGraphicsSystem *QApplicationPrivate::graphics_system = 0; // default graphics system
 QString QApplicationPrivate::graphics_system_name;         // graphics system id - for delayed initialization
+bool QApplicationPrivate::runtime_graphics_system = false;
 Q_GLOBAL_STATIC(QMutex, applicationFontMutex)
 QFont *QApplicationPrivate::app_font = 0;        // default application font
 QFont *QApplicationPrivate::sys_font = 0;        // default system font
 QFont *QApplicationPrivate::set_font = 0;        // default font set by programmer
 \list
 \o  -display \e display, sets the X display (default is $DISPLAY).
 \o  -geometry \e geometry, sets the client geometry of the first window
 that is shown.
 \o  -fn or \c -font \e font, defines the application font. The font
-should be specified using an X logical font description.
+should be specified using an X logical font description. Note that
+this option is ignored when Qt is built with fontconfig support enabled.
 \o  -bg or \c -background \e color, sets the default background color
 and an application palette (light and dark shades are calculated).
 \o  -fg or \c -foreground \e color, sets the default foreground color.
 \o  -btn or \c -button \e color, sets the default button color.
 \o  -name \e name, sets the application name.
 {
 initResources();
 qt_is_gui_used = (qt_appType != QApplication::Tty);
 process_cmdline();
+// the environment variable has the lowest precedence of runtime graphicssystem switches
+if (graphics_system_name.isEmpty())
+graphics_system_name = QString::fromLocal8Bit(qgetenv("QT_GRAPHICSSYSTEM"));
 // Must be called before initialize()
 qt_init(this, qt_appType
 #ifdef Q_WS_X11
 , dpy, visual, cmap
 #endif
 }
 #endif // Q_WS_X11
 extern void qInitDrawhelperAsm();
+extern void qInitImageConversions();
 extern int qRegisterGuiVariant();
 extern int qUnregisterGuiVariant();
 #ifndef QT_NO_STATEMACHINE
 extern int qRegisterGuiStateMachine();
 extern int qUnregisterGuiStateMachine();
 #endif //QT_AUTO_MAXIMIZE_THRESHOLD
 #endif //Q_WS_WINCE
 // Set up which span functions should be used in raster engine...
 qInitDrawhelperAsm();
+// and QImage conversion functions
+qInitImageConversions();
 #ifndef QT_NO_WHEELEVENT
 QApplicationPrivate::wheel_scroll_lines = 3;
 #endif
 Sets the default graphics backend to \a system, which will be used for
 on-screen widgets and QPixmaps. The available systems are \c{"native"},
 \c{"raster"} and \c{"opengl"}.
-This function call overrides both the application commandline
+There are several ways to set the graphics backend, in order of decreasing
-\c{-graphicssystem} switch and the configure \c{-graphicssystem} switch.
+precedence:
+\list
-\warning This function must be called before the QApplication constructor
+\o the application commandline \c{-graphicssystem} switch
+\o QApplication::setGraphicsSystem()
+\o the QT_GRAPHICSSYSTEM environment variable
+\o the Qt configure \c{-graphicssystem} switch
+\endlist
+If the highest precedence switch sets an invalid name, the error will be
+ignored and the default backend will be used.
+\warning This function is only effective before the QApplication constructor
 is called.
 \note The \c{"opengl"} option is currently experimental.
 */
 void QApplication::setGraphicsSystem(const QString &system)
 {
-QApplicationPrivate::graphics_system_name = system;
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+if (QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+QRuntimeGraphicsSystem *r =
+static_cast<QRuntimeGraphicsSystem *>(QApplicationPrivate::graphics_system);
+r->setGraphicsSystem(system);
+} else
+#endif
+QApplicationPrivate::graphics_system_name = system;
 }
 /*!
 Returns the color specification.
 */
 void QApplication::closeAllWindows()
 {
 bool did_close = true;
 QWidget *w;
-while((w = activeModalWidget()) && did_close) {
+while ((w = activeModalWidget()) && did_close) {
-if(!w->isVisible())
+if (!w->isVisible() || w->data->is_closing)
 break;
 did_close = w->close();
 }
 QWidgetList list = QApplication::topLevelWidgets();
 for (int i = 0; did_close && i < list.size(); ++i) {
 w = list.at(i);
-if (w->isVisible() && w->windowType() != Qt::Desktop) {
+if (w->isVisible()
+&& w->windowType() != Qt::Desktop
+&& !w->data->is_closing) {
 did_close = w->close();
 list = QApplication::topLevelWidgets();
 i = -1;
 }
 }
 {
 #if defined(Q_WS_WIN)
 qt_win_set_cursor(cursorWidget, true);
 #elif defined(Q_WS_X11)
 qt_x11_enforce_cursor(cursorWidget, true);
-#elif defined(Q_WS_S60)
+#elif defined(Q_OS_SYMBIAN)
 qt_symbian_set_cursor(cursorWidget, true);
 #endif
 }
 }
 #endif
 \sa QWidget::layoutDirection, isLeftToRight(), isRightToLeft()
 */
 void QApplication::setLayoutDirection(Qt::LayoutDirection direction)
 {
-if (layout_direction == direction)
+if (layout_direction == direction || direction == Qt::LayoutDirectionAuto)
 return;
 layout_direction = direction;
 QWidgetList list = topLevelWidgets();
 QApplicationPrivate::modifier_buttons = ie->modifiers();
 }
 #endif // !QT_NO_WHEELEVENT || !QT_NO_TABLETEVENT
 }
+#ifndef QT_NO_GESTURES
 // walk through parents and check for gestures
 if (d->gestureManager) {
 switch (e->type()) {
 case QEvent::Paint:
 case QEvent::MetaCall:
 if (d->gestureManager->filterEvent(receiver, e))
 return true;
 }
 }
 }
+#endif // QT_NO_GESTURES
 // User input and window activation makes tooltips sleep
 switch (e->type()) {
 case QEvent::Wheel:
 case QEvent::ActivationChange:
 }
 #endif
 res = d->notify_helper(receiver, e);
 break;
+#ifndef QT_NO_GESTURES
 case QEvent::NativeGesture:
 {
 // only propagate the first gesture event (after the GID_BEGIN)
 QWidget *w = static_cast<QWidget *>(receiver);
 while (w) {
 } else {
 res = d->notify_helper(receiver, e);
 }
 break;
 }
+#endif // QT_NO_GESTURES
 default:
 res = d->notify_helper(receiver, e);
 break;
 }
 Only one application object can be created.
 \sa QCoreApplication::instance()
 */
+#ifndef QT_NO_IM
 // ************************************************************************
 // Input Method support
 // ************************************************************************
 /*!
 This function replaces the QInputContext instance used by the application
 with \a inputContext.
+Qt takes ownership of the given \a inputContext.
 \sa inputContext()
 */
 void QApplication::setInputContext(QInputContext *inputContext)
 {
-Q_D(QApplication);
+if (inputContext == QApplicationPrivate::inputContext)
-Q_UNUSED(d);// only static members being used.
+return;
 if (!inputContext) {
 qWarning("QApplication::setInputContext: called with 0 input context");
 return;
 }
-delete d->inputContext;
+delete QApplicationPrivate::inputContext;
-d->inputContext = inputContext;
+QApplicationPrivate::inputContext = inputContext;
+QApplicationPrivate::inputContext->setParent(this);
 }
 /*!
 Returns the QInputContext instance used by the application.
 }
 }
 #endif
 return d->inputContext;
 }
+#endif // QT_NO_IM
 //Returns the current platform used by keyBindings
 uint QApplicationPrivate::currentPlatform(){
 uint platform = KB_Win;
 #ifdef Q_WS_MAC
 const QList<QTouchEvent::TouchPoint> &touchPoints)
 {
 QApplicationPrivate::translateRawTouchEvent(window, deviceType, touchPoints);
 }
+#ifndef QT_NO_GESTURES
 QGestureManager* QGestureManager::instance()
 {
 QApplicationPrivate *qAppPriv = QApplicationPrivate::instance();
 if (!qAppPriv->gestureManager)
 qAppPriv->gestureManager = new QGestureManager(qApp);
 return qAppPriv->gestureManager;
 }
+#endif // QT_NO_GESTURES
 // These pixmaps approximate the images in the Windows User Interface Guidelines.
 // XPM

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613