summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-1/+16
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Trigger fullscreen transition effects properly on app exit.Laszlo Agocs2011-04-141-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Avkon calls BeginFullScreen() and EndFullScreen() to trigger the fullscreen system transition effects for application exit, however the calls are made too late for Qt apps because the widgets are already destroyed. Instead, the effects are triggered explicitly from Qt, before closing the widgets, or from aboutToQuit, whichever comes first. Task-number: QT-4718 Reviewed-by: Jani Hautakangas
* | Cocoa: fix scroll optimization bugRichard Moe Gustavsen2011-01-241-0/+2
| | | | | | | | | | The optimization commited a few commits before this one faulty stopped normal dispatching of enter/leave. This patch fixes this.
* | Add support for disabling touch on to enhance scrolling in CocoaRichard Moe Gustavsen2011-01-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | On Mac/Cocoa, enabling touch on a widget slows down the scrolling performance of the whole application. It seems Cocoa spends some time in the background figuring out what to do with the touch events, and whether or not it should convert them to scroll/wheel events. Therefore, it makes sense to no subscribe for touch when the mouse is not over the widget, This patch implements that strategy, and the effect is huge when tested agains creator. Rev-By: brad
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Richard Moe Gustavsen2011-01-171-5/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | alien-squached Conflicts: src/gui/kernel/qcocoasharedwindowmethods_mac_p.h src/gui/kernel/qcocoaview_mac.mm src/gui/kernel/qwidget_mac.mm
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| | * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | * QApplication: fix crash exit whith native windowsOlivier Goffart2010-12-141-3/+3
| | | | | | | | | | | | | | | | | | | | | Regression introduced in 8dd8db250d92521fda619bdcf3e1c859b37b2da0 Patch comes from the task Task-number: QTBUG-15774
| * | Fix QApplication::setGraphicsSystem() since lighthouse integrationGunnar Sletta2010-12-081-1/+0
| | | | | | | | | | | | | | | | | | | | | The application set parameter was overridden by this piece of ligthhouse legacy. Reviewed-by: Jørgen Lind
* | | Alien implementation for the Cocoa portRichard Moe Gustavsen2011-01-171-12/+1
|/ / | | | | | | Give Alien on Cocoa a warm welcome.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-2/+10
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Added environment variable for style overriding.Dominik Holland2010-11-021-2/+10
| | | | | | | | | | | | This is needed to run all autotests in a specified style by default. Reviewed By: Harald Fernengel
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-2/+7
|\ \ | |/
| * Do not crash on SymbianAlessandro Portale2010-10-281-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml debugging enabler in QtDeclarative made any Qt app crash which used QDeclarative. Reason was that QtDeclarative.dll tried to directly access (private) writable static data from QtGui.dll. This patch adds an accessor function for the data to QtGui, and the crash is gone. Done-by: Kai Koehne Reviewed-by: Kai Koehne Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-2/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-2/+5
| |\ \ | | |/
| | * Allow default QApplication::startDragDistance() to be defined in platformdefs.hMartin Jones2010-10-061-2/+5
| | | | | | | | | | | | | | | Task-number: QT-3930 Reviewed-by: Joona Petrell
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-2/+13
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-0/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-241-2/+7
| | |\
| | * | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13377 Reviewed-by: Jerome Pasion
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-2/+7
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| | * | Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-231-2/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression fron 4.6 release. Menu entries with some specific roles are automatically merged to the application menu. They are now translated based on the context "MAC_APPLICATION_MENU" instead of "QMenuBar" context. This patch eanbles the use for both contexts. Task-number: QTBUG-13878 Reviewed-by: Richard Moe Gustavsen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-2/+37
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-2/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
| | * fix QTBUG-13501 - crash when a gesture is accepted but not consumedJeremy Katz2010-09-141-2/+4
| | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * Remove compiler warning in qapplication.cpp.Jason Barron2010-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | Fix a warning since we were deleting the graphics_system instance, but the type was only forward declared. Reviewed-by: Samuel
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-101-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix crash in QRuntimeGraphicsSystem due to destruction order. Fix crash in OpenVG when failing to allocate large VGImages. Updated 4.7.0 changelog
| | | * Fix crash in QRuntimeGraphicsSystem due to destruction order.Jason Barron2010-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, fix a "leak" by deleting the graphics system when QApplication is destroyed. Secondly, fix a crash when the following scenario occurs: - ~QApplication() deletes the current graphics system (see above) - ~QApplication() calls qt_cleanup() - qt_cleanup() calls QPixmapCache::clear() to delete pixmaps - ~QRuntimePixmapData() tries to remove the pixmap from the runtime graphics system, but it has already been deleted. - *Crash* Reviewed-by: Gunnar Sletta Reviewed-by: Jani Hautakangas
| | * | Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| | |/ | | | | | | | | | | | | | | | | | | MeeGo touch doesn't yet work with other graphics systems since it assumes that QPixmaps are XPixmap based. If MeeGo touch doesn't link against the graphics system helper we'll force it to use the native graphics system.
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-0/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| | * resolving method name does not work for Symbian so need to use ordinal insteadPetri Kiiskinen2010-09-071-0/+6
| | | | | | | | | | | | | | | Merge-request: 768 Signed-off-by: axis <qt-info@nokia.com>
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-12/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-191-12/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp
| * \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-191-13/+20
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/opengl/qgl_p.h
| | * | Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog ↵Carlos Manuel Duclos Vergara2010-08-181-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Mac The problem was the order of deletion in the destructor. To autotest this I create an application, start a modal dialog and then quit the application. The fix was contributed by a customer. Task-number: QTBUG-12673 Reviewed-by: Olivier Goffart
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-031-4/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure
* | \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-1/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | | Increase drag distance on Symbian to improve finger usability on capacitive ↵Joona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones
| | * | | Cocoa: Active QDockWidget does not stay on top of inactive QDockWidgetRichard Moe Gustavsen2010-08-031-0/+7
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window has several child windows, it was not be possible to click on a child window to make it stack in front of the other children. The reason is that cocoa held a fixed stacking order of the child windows (sub-windows). This patch will release, and then reestablish, the stacking order of the children upon acitvation. Task-number: QTBUG-11780 Reviewed-by: prasanth
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-041-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: configure
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when a static QWidget is destroyed after the QApplication object. Task-number: QTBUG-12025 Reviewed-by: Zeno Albisser
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-101-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
| | | * | Fix compilation when QT_NO_IM is definedTasuku Suzuki2010-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 734 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>