summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa: Menu in menubar stays highlightedRichard Moe Gustavsen2010-02-106-2/+72
| | | | | | | | | | | | | | | | | If you use the menu bar for a window to open up another window woth no menu bar, the first menu bar stays highlighted once it is set as current again. The reason is that we remove the first menu bar before cocoa gets a chance to update it correctly. This patch implements a system for us to post a message/call to cocoa, so we delay removing the toolbar until after cocoa has finished closing it properly. NB: Rather than posting the call to a window on screen, it would have been better and safer to post it no window, and then receive the event in the event handler of NSApplication. But for the moment, we have decided not to subclass NSApplication... Rev-By:prasanth
* Compile fix for embedded.Denis Dzyubenko2010-02-084-10/+0
| | | | Reviewed-by: trustme
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0810-221/+354
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| * Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| | | | | | | | | | | | | | | | | | Change af7d2b2127dadbdf828c60c75255bb1b4f591651 does have some negative side-effects. This should limit the fix to void unnecessary activation when the parent window already has focus. Reviewed-by: denis
| * Added new mouse cursor types.Denis Dzyubenko2010-02-059-220/+350
| | | | | | | | | | | | | | | | | | | | | | Added Qt::DragCopyCursor, DragMoveCursor and DragLinkCursor that are already used internally for drag-n-drop, but were not exposed before. On X11 made them use themed cursors through the Xcursor library. Drag-n-drop now use these new cursors. Inspired-by: David Benjamin MR#2215 Reviewed-by: Bradley T. Hughes
* | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-051-11/+9
|/ | | | | | | | | This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63. The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen was used, but WA_DontShowOnScreen should only have visual effects. Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-044-9/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * Always activate popup windows on showJens Bache-Wiig2010-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The problem was that popups that were opened from a system tray icon did not get activated and clicking outside would not close the popup as intended. Ensuring that all popups get activated on show should solve this problem in the general sense. Task-number: QTBUG-7386 Reviewed-by: denis
| * Cocoa: Tool Windows steal focus from the main windowRichard Moe Gustavsen2010-02-043-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The example that shows this off is tools/inputpanel. This example is strangely written, and calls activateWindow on the main window in an activate callback to another window. So a bit recursion will happend, and this caused troubble for the cocoa port. In addition, in Qt several windows can be active at the same time, expecially tool windows. This means that we need to be careful when returning early from the becomeKeyWindow methods for NSWindow. This patch fixes up on this stuff. Task-number: QTBUG-6002 Reviewed-by: msorvig
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0410-175/+681
|\ \ | |/ |/| | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-037-171/+676
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-039-15/+64
| | |\
| | * | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-037-171/+676
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented features: Softkey Merging: Widget can set only one softkey and set flag that rest of the softkeys shall be taken from parent. Priority Handling: If multiple sokftkeys with same role are set, the highest priority action gets displayed. Custom Softkey Menu: By setting QMenu to QAction and assigning a softkey role for that action, the native menubar will be displayed when sofkey is clicked. Softkey Image: Initial code for implementing sofkey image support, the final implementation is still pending legal acceptance to use eiksoftkeyimage.h header file which is under EPL license. Task-number: QTBUG-7315 Review-By: Sami Merila Review-By: Jason Barron
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-013-4/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-013-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| * | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change: f842ec12706. Needed some ekstra checks for the cocoa port as well. Task-number: QTBUG-4227 Reviewed-by: Prasanth (cherry picked from commit ebf9c943b789bb4ce1e1222ed17cc37bd0b1f1fe)
| * | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash occurs because we at one point try to assign a widget that is marked as 'about to be deleted' to a QPointer, after clearguards has been called. The correct fix is to avoid such an assignment in the first place. Task-number: QTBUG-4227 Reviewed-by: Prasanth (cherry picked from commit f842ec12706b70f94ab5f634dc2aa025ba2cf3f2)
* | | Qt applications not responding to WM_GETHOTKEY on windows.Prasanth Ullattil2010-02-032-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On windows when an application has been started through a shortcut link, (either by double-clicking or by pressing the shortcut key assigned in the link) the STARTUPINFO contains the hotkey associated to the application. This should be set on the toplevel using WM_SETHOTKEY, so that it behaves like native applications. Task-number: QUTBUG-3426 Reviewed-by: Jens Bache-Wiig Reviewed-by: bnilsen
* | | Merge commit 'origin/master'Richard Moe Gustavsen2010-02-021-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm tools/linguist/lupdate/main.cpp
| * \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-018-15/+58
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
* | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-017-14/+56
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-271-15/+31
| | | | | | | | | | | | Reviewed-by: Eskil
| * | Mac: Calling showFullScreen() then showNormal() on a widget results in top ↵Carlos Manuel Duclos Vergara2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu hiding. The problem here was the way we entered Full Screen Mode. We were using "kUIModeAllSuppressed" which does the following according to the manual: kUIModeAllSuppressed All system UI elements (including the menu bar) are hidden. However, these elements may automatically show themselves in response to mouse movements or other user activity. I changed it to "kUIModeAllHidden", which does the following: All system UI elements (including the menu bar) are hidden. To prevent a change of behavior I added the following option to the SetSystemUIMode: kUIOptionAutoShowMenuBar This flag specifies that the menu bar automatically shows itself when the user moves the mouse into the screen area that would ordinarily be occupied by the menu bar. Only valid for the presentation mode kUIModeAllHidden. Task-number: QTBUG-7625 Reviewed-by: Richard Moe Gustavsen
| * | Cocoa: qaccessibility test crashesRichard Moe Gustavsen2010-01-272-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that the test first creates a menu bar with an exit item The exit item gets merged into the appmenu (together with a QAction) Then we destroy the menu bar, but leave the exit item in the appmenu untouched. Then we create a new menubar _without_ an exit item macUpdateMenubar will then, at one point, try to access the old exit item's QAction, wich is destroyed a long time ago; crash! This patch will make sure we clear out all actions in the menu bars appmenu when the menubar gets destroyed. Reviewed-by: Prasanth
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-274-2/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) When checking to see if a signal is connected, compare the match-arguments too Do the refcounting of services watched properly. Autotest: make the test valid for multiple Qt versions Cocoa: qfiledialog test spits out memory warnings Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. Don't use QDebug references. Instead, pass by value. QNativeSocketEngine: Set OS error strings on failed read() QNativeSocketEngine: Also handle unknown errors from socket engine Qt/Cocoa Event Dispatcher Problem in modal dialogs Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) 'test -e' is a bashism. It's not available in traditional sh. QFileNetworkReply: Use a QFileEngine Crash when deleting QMainWindow with native toolbar on Cocoa. QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. ...
| | * | Cocoa: qfiledialog test spits out memory warningsRichard Moe Gustavsen2010-01-261-0/+3
| | | | | | | | | | | | | | | | | | | | We need an auto release pool! (cherry picked from commit 7ad08868de4b3e481a51a3431504fcf42a4bbf6d)
| | * | Qt/Cocoa Event Dispatcher Problem in modal dialogsRichard Moe Gustavsen2010-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we didn't check if the event dispatcher was interrupted before starting to wait for more events. This patch will do the interrupt test after processing modal session events, and just before starting to wait. This will fix applications that expects e.g an event loop to exit immidiatly upon a signal from a timer (without the need for the user to generate e.g. a mouse event to stop the wait). Task-number: QTBUG-7503 Reviewed-by: cduclos
| | * | Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peakRichard Moe Gustavsen2010-01-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason was that QMacCocoaAutoReleasePool included a a call to NSApplicationLoad(). This call should only be made for carbon based application anyway, so we just ifdef it out (event how clumsy the placing of the call is). The CPU problem came because after the call, [NSApp isRunning] would return true, an as such, confuse the event dispatcher later on. Reviewed-by: MortenS
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-242-1/+5
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | | * Fix NSCFNumber autorelease warning on Mac.Morten Johan Sørvig2010-01-221-0/+4
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-7385 Revby: Lorn Potter
| | | * Add a reference to adjustSize() from the size propertyAndy Shaw2010-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7401 Reviewed-by: TrustMe
| * | | Remove unneeded resources from QtGuiAlessandro Portale2010-01-261-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui contains loads of resources. 337,160 bytes just for qstyle. And since this is nearly exclusively full of PNG files, it won't really be compressed in the qt.sis package. And it will eat unneccessary Ram. This patch removes about 260,000 bytes of resources. We only want the 32-pixel big icons. No 16- and 129- pixel versions. Task-number: QTBUG-7277 Reviewed-by: Sami Merila modified: src/gui/kernel/qapplication.cpp new file: src/gui/styles/qstyle_s60.qrc modified: src/gui/styles/styles.pri
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0129-332/+780
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change: f842ec12706. Needed some ekstra checks for the cocoa port as well. Task-number: QTBUG-4227 Reviewed-by: Prasanth
| * | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash occurs because we at one point try to assign a widget that is marked as 'about to be deleted' to a QPointer, after clearguards has been called. The correct fix is to avoid such an assignment in the first place. Task-number: QTBUG-4227 Reviewed-by: Prasanth
| * | | Cocoa: implement usage of override cursorsRichard Moe Gustavsen2010-01-284-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This have never worked in the Cocoa port, it seems. This patch gives it a try. Reviewed-by: msorvig
| * | | Cocoa: qfiledialog test spits out memory warningsRichard Moe Gustavsen2010-01-261-0/+3
| | | | | | | | | | | | | | | | We need an auto release pool!
| * | | Carbon: fix build breakage on carbonRichard Moe Gustavsen2010-01-261-0/+2
| | | | | | | | | | | | | | | | Just forgot an ifdef...
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-223-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-223-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | | * \ \ Merge branch 'merge-request-1601' into master-s60axis2010-01-053-3/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| | | | * | | Make all Symbian #includes lower case.Anderson Lizardo2009-10-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * | | | | | The declaration of qt_x11Data needs to be consistent across the headerDarin Broady2010-01-221-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the implementation file, and this includes it's visibility. This error and patch was found while attempting to get symbol visibility to work with the SunStudio compilers (coming later). I went with the visibility setting from the implementation file (qapplication_x11.cpp) because I don't know if this variables is used outside of libQtGui.so, especially in 3rd-party code. If it's not supposed to be used outside of libQtGui.so, then the proper change would be to remove the Q_GUI_EXPORT from the definition in qapplication_x11.cpp. Merge-request: 433 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-215-14/+92
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-184-2/+29
| |\ \ \ \ \
| * | | | | | Cocoa: sub-windows do not stack in front of parentsRichard Moe Gustavsen2010-01-152-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like this were never implemented. This patch does. Task-number: QTBUG-7375
| * | | | | | Cococa: QDialogs stays on top when application is not activeRichard Moe Gustavsen2010-01-152-32/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At one point in history, we decided that QDialogs should stack just above normal windows. This patch reverts this behaviour, as cocoa gets confused if we stack a dialog at this level without telling it to be modal. So instead, we let cocoa set the modal window level when we create a modal session, and also let cocoa restore the level to what it were when the sessions ends. That way, we avoid doing the work that cocoa is allready designed to do. Task-number: QTBUG-5057 Reviewed-by: msorvig
| * | | | | | Merge branch '4.6'Thiago Macieira2010-01-13187-210/+224
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | | | Revert "Add an autorelease pool to QApplication instance."Richard Moe Gustavsen2010-01-131-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 705ebaea0d81c76c97e7230f0acbe85442981555. For some strange reason, the change that we revert caused a lot of problems; the menu bar stopped working, duplicating menu items etc., and modality stopped working correctly. So there is only one thing to do: revert. Rev-By: msorvig
| * | | | | | | Merge branch '4.6'Thiago Macieira2010-01-122-2/+3
| |\ \ \ \ \ \ \
generated by cgit v0.12 at 2024-11-30 06:16:08 (GMT)