summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Do not crash on SymbianJason McDonald2010-10-291-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 (cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1) Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
* Update license headers to release version.Jason McDonald2010-10-181-13/+13
|
* Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-241-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 (cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-231-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 (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* 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.
* 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>
* 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
* 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
* 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>
* | SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImageJohn Brooks2010-07-071-0/+3
|/ | | | | Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Making orbit input methods work with Qt apps with -no-s60mread2010-07-011-2/+2
| | | | | | | This change allows Qt to load the Orbit input methods in Symbian builds when Qt is configured with -no-s60 Reviewed-by: Sami Merila
* fix for broken input method loadingmread2010-07-011-1/+1
| | | | | Changed use of wrong flag "Q_WS_SYMBIAN" back to "Q_WS_S60" so that input methods should work correctly in S60 builds of Qt.
* Avkon removal configured with -no-s60mread2010-07-011-2/+2
| | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-121-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else" Updated leading whitespace to make indentation more consistent Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms. make postgresql support sensitive to PSQL_LIBS support for cross building Qt for MinGW (win32-g++) on Unix use "win32-g++*" scope to match all MinGW makespecs Demos: Fix compilation with namespace. ...
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-06-071-4/+22
| |\ | | | | | | | | | 4.7-staging1
| * | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/gui/kernel/[qapplication|qwidget].cpp, tests/auto/qapplication/tst_[qapplication|qwidget].cpp (setInputContext): The documentation for [QApplication|QWidget]::setInputContext claims that the [QApplication|QWidget] instance would take ownership. This commit fixes the setter to also reparent the input context. Furthermore, the crappy test for this setter was improved. Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | Handle setting the layoutDirection to Qt::LayoutDirectionAutoLars Knoll2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting it to LayoutAuto will be ignored on an application level (only LeftToRight or RightToLeft are valid). On a widget level is does the same as calling unsetLayoutDirection(). Reviewed-by: Simon Hausmann
* | | Allow to build Qt in static with mingwThierry Bastian2010-06-071-1/+1
| |/ |/| | | | | | | | | | | | | | | | | Some functions were marked with Q_DECL_IMPORT where they should just be Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport). That leads the linker to try to import it and it shouldn't. Task-number: QTBUG-10791 Reviewed-by: gabi
* | Add a new qconfig feature GESTURESTasuku Suzuki2010-06-021-1/+8
| | | | | | | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
|/ | | | | | | | Add environment variable switch for graphicssystem so a default can be set at runtime without passing a command-line parameter. Merge-request: 622 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add runtime_graphics_system flag to QApplicationPrivate.Jani Hautakangas2010-05-281-0/+1
| | | | | | | | | | This flag can be internally used to detect if QRuntimeGraphicsSystem is used. In some cases Qt needs to know if runtime graphics system is used and it's better to have a flag than relsolving graphics system name every time. Reviewed-by: Jason Barron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-271-1/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-271-7/+11
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.h
| * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201-0/+17
| |\ \
| * | | QRuntimeGraphicsSystemJani Hautakangas2010-05-201-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRuntimeGraphicsSystem is a proxy graphics system which can dynamically switch underlying graphics system on runtime. For example, switch from hardware accelerated graphics system to raster graphics system on low GPU memory situation. This feature is currently supported on Symbian platform. Task-number: QT-3276 Reviewed-by: Jason Barron
* | | | Update documentation for the -font command line optionBradley T. Hughes2010-05-271-1/+2
| |_|/ |/| | | | | | | | | | | | | | | | | This option is ignored when Qt is built with fontconfig support, make sure it is documented. Task-number: QTBUG-3671
* | | Dont crash when assigning the same input context twice.Denis Dzyubenko2010-05-251-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a guard check to return if the given input context is the same is we already have. Explicitly mention in the doc that we take ownership of the given input context object. Task-number: QTBUG-10780 Reviewed-by: Thomas Zander
* | | QApplication::closeAllWindows() should ignore windows being closedBradley T. Hughes2010-05-201-3/+5
| |/ |/| | | | | | | | | | | | | | | | | | | It is very common to display a dialog in response to a close event. Closing the window again will result in QWidget::close() returning true. This confuses QApplication::closeAllWindows(), since the window is still visible even though it was closed (or is closing). Solve this by ignoring windows that have the is_closing flag set in their widget data. Task-number: QTBUG-7635 Reviewed-by: Denis Dzyubenko
* | Propagate LocaleChange event from application to widgets.Denis Dzyubenko2010-05-031-0/+13
| | | | | | | | | | | | | | The LocaleChange event will be sent to the QApplication object and then propagated to all widgets down the hierarchy starting with toplevels. Reviewed-by: Thomas Zander
* | Support updating system locale data on SymbianDenis Dzyubenko2010-05-031-0/+4
|/ | | | | | | | | Subscribing to the locale change notification to be able to update the system locale whenever the user changes the current system locale. Task-number: QTBUG-4870 Reviewed-by: Thomas Zander Reviewed-by: Jason Barron
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtGuiu.def tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron
* | Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGuiTasuku Suzuki2010-04-151-0/+2
| | | | | | | | | | Merge-request: 2327 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | Make encoding clearThomas Zander2010-04-071-2/+2
| | | | | | | | Reviewed-by: Thiago Macieira
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-221-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| * | Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890Prasanth Ullattil2010-03-181-0/+2
| | | | | | | | | | | | | | | | | | | | | The function is needed only on Mac. Task-number: QTBUG-4463 Reviewed-by: TrustMe
| * | Incorrect translation for Application menu items in Mac.Prasanth Ullattil2010-03-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A behavior change was introduced by the commit 97b8727635a73197fac4f5edb8a1122733933db4. The menu items with menuRoles will now be translated like Native Mac applications. Translations/merging of menu items are done as follows: 1) AboutRole ==> "About <Application>" 2) PreferencesRole ==> "Preferences..." 3) QuitRole ==> "Quit <Application>" Task-number: QTBUG-4463 Reviewed-by: mortens
* | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-7/+9
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Initialize the graphics system before creating the style.Jason Barron2010-03-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Previously if the style was creating any pixmaps they were going to the createDefaultPixmapData() function which creates a default platform pixmap without considering the graphics system. If these pixmaps are used they may end up going through a suboptimal code path because they are not the same type of pixmap that is expected by the graphics system. The fix here is to intialize the graphics system before the style is created. Reviewed-by: Trond
| * Removed unused macro.Adrian Constantin2010-03-031-4/+0
| | | | | | | | Reviewed-by: Stefano Pironato
| * Allow platform specific values for the double click radius.Raino Priha2010-03-021-0/+4
| | | | | | | | | | Task-number: QT-2883 Reviewed-by: Volker Hilsheimer
* | Application menu is not translated in Mac OS X CocoaPrasanth Ullattil2010-03-031-0/+16
| | | | | | | | | | | | | | | | | | | | | | The application menu is loaded from the qt_menu.nib which only has English strings. These will now be translated using Qt's own translation mechanism. Every time a new translator is installed, the menu will now try to get the new string. Modification of qt_xx.ts files are done in a different patch. Task-number: QTBUG-4463 Reviewed-by: MortenS
* | Implement alien widgets on Mac/Cocoa.Morten Johan Sørvig2010-03-021-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes alien widgets opt in on a per-widget basis on Mac, set the Qt::WA_NativeWindow flag when creating the widget to enable. Setting this flag on widgets that have native child or sibling NSViews is not supported. The main use case for alien widgets on Mac is to improve performance for applications that have complex user interfaces. Qt can handle thousands of widgets per window, while Cocoa is designed to use a smaller number of NSViews in combination with NSCells and custom control implementations. This commit moves us in the direction of having a few main NSViews with "leaf" qwidgets implemented as a custom control.