summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-183-7/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (46 commits) Build and run QElapsedTimer test. Fix license headers. Add flag to indicate that network sessions are expected on a platform. Don't fail unit test when there is no default network configuration. Make destructor virtual. Optimized QLocale to access system locale on demand. Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce Compile fix on keypad-navigation systems Force qt-zlib to be used for host system when cross compiling. qmake: fix to create proper install target in Makefile at first run compile fix for Windows Fixed focus handling when Qt is embedded into Cocoa app. Do not beep on Mac when pressing some keys. Do not deliver the same key event multiple times in Cocoa. Implement Idle-priority threads for Linux. Improved qt_x11_wait_for_window_manager Doc: document QElapsedTimer Added missing "const" for mac. qdoc3: Fixed some ifdef typos and removed some whitespace. Manual test for QTBUG-8933. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-183-7/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) Make destructor virtual. Optimized QLocale to access system locale on demand. Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce Compile fix on keypad-navigation systems Force qt-zlib to be used for host system when cross compiling. qmake: fix to create proper install target in Makefile at first run compile fix for Windows Fixed focus handling when Qt is embedded into Cocoa app. Do not beep on Mac when pressing some keys. Do not deliver the same key event multiple times in Cocoa. Implement Idle-priority threads for Linux. Improved qt_x11_wait_for_window_manager Doc: document QElapsedTimer Added missing "const" for mac. qdoc3: Fixed some ifdef typos and removed some whitespace. Manual test for QTBUG-8933. Cocoa: minisplitter has only 1px wide grab area "Strictly" Fullscreen Application in Mac OS Bugfix the Symbian implementation Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch ...
| | * Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-173-7/+7
| | |
| | * Port QtGui uses of QTime as a stopwatch to QTimestampThiago Macieira2010-03-173-7/+10
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-181-11/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add a raw bind() function to QGLBuffer. QTreeView: Remove a lot of useless and slow code. Make sure XCopyArea has completed before resuming rendering Make QX11GLPixmapData::scroll() return a value Fix some rendering/scrolling artifacts with QX11GLWindowSurface Implement scrolling in QX11GLWindowSurface Make WA_TranslucentBackground work with QX11GLWindowSurface Add ultra-paranoid synchronization to QX11GLPixmapData Fixed a potential crash in headerview when inserting a section Fix a sizing issue of message box on windows Vista/7
| * | Fix a sizing issue of message box on windows Vista/7Thierry Bastian2010-03-171-11/+38
| |/ | | | | | | | | | | | | | | The problem is that the font changes after the creation of the buttons and we were setting a fixed size to the datails button. Task-number: QTBUG-8381 Reviewed-by: gabi
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-171-23/+46
|\ \ | |/ |/| | | | | | | Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def
| * Make QColorDialog usable on small screensHarald Fernengel2010-03-151-23/+46
| | | | | | | | | | | | | | | | | | | | | | QColorDialog was always assuming that it got its minimal size requirements. On a lot of screens, this was not the case, so choosing a color in the QColorPicker was totally off. This patch handles the resize event correctly, so the QColorPicker will be usable on all possible screen sizes. This fixes Maemo's bug https://bugs.maemo.org/show_bug.cgi?id=9526 Reviewed-by: Robert Griebl
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-174-39/+65
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) probably need to update user configurations once in a while too use dynamicstore instead Define JS_NO_EXPORT to avoid JSC C API functions being exported Don't use QScriptValueIterator to iterate over an array QtScript: Fix regression when calling newQObject() from native constructor Added note to OS X installation instructions. Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME Update only appropriate rectangles during update_sys(). Marked QTDS obsolete from Qt 4.7. QNetworkReply: Fix canReadLine() Abort waiting replies on session error. different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-154-39/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-03-151-1/+2
| | |\ \ | | | | | | | | | | | | | | | 4.7-staging1
| | | * | doc: Completed sentence about HideNameFilterDetailsThorbjørn Lindeijer2010-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Use the vista-style native dialog for QFileDialog::getExistingDirectoryJohn Brooks2010-03-151-0/+62
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use IFileOpenDialog with FOS_PICKFOLDERS instead of SHBrowseForFolder as the native directory browse dialog on Vista. This provides a much better UI and is consistent with Vista UX. Old behavior is retained for pre-vista systems. Merge-request: 488 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-112-38/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method. qdoc: Added debug code. Update separate regions instead of their bounding box. doc: Fixed three new qdoc errors. Autotest: make the qabstractslider test pass on mac Compile Mac: scroll speed does not match native applications qdoc: Fixed lookup of QML property nodes. configure.exe: Fix inverted logic Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert Compile QtScript: Improve performance of type resolution when calling slots Improve performance of QScriptValueIterator Add default argument values for QScriptValuePrivate property functions Move method implementation to private class Add benchmarks for QScriptValueIterator ...
| | | * | remove unneeded "permissions normalization" code from QFileInfoGathererRitt Konstantin2010-03-092-38/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the file engine now properly calculates user permissions, there's no need to check the owner and group IDs here. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | Fix the QPrintDialog showing a popup with nothing.Alexis Menard2010-03-161-3/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPrintDialog uses QFileSystemModel with QCompleter. In that case with the 4.7 version of QCompleter it was trying to complete stuff even if the prefix was empty. I also fixed QPrintDialog, it was using QFSCompleter which didn't work in QPrintDialog (QFSCompleter is designed for QFileDialog). Now it uses a regular QCompleter. Task-number:QTBUG-8556 Reviewed-by:trond
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-153-4/+47
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Conflicts: src/gui/styles/qs60style_s60.cpp
| * | Fixed dialog resize not to move the dialog for Symbian.Janne Anttila2010-03-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDialog::resize() also moved the dialog in Symbian. This occured since adjustPosition was called as an result of resize and that method did not check if dialog position was explicitly set. In addition it was found that in Symbian WA_Resized and WA_Moved attributes were basically set for almost all top-level widgets by system. This was also fixed and a new auto test was introduced to verify these attributes in all platforms. Windows platform also suffers from bug in this area, and a separate task QTBUG-5897 for it was created Task-number: QTBUG-5897 Reviewed-by: Sami Merila
| * | QUnixPrintWidget should not be declared in SymbianMiikka Heikkinen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Having QUnixPrintWidget declaration causes build breaks in some environments, so defined it out in Symbian. Part of QtP delta reduction effort. Reviewed-by: Janne Anttila
| * | Get the printDialog to check for default paperSize via CUPSPierre Rossi2010-03-091-1/+37
| | | | | | | | | | | | | | | Task-number: QTBUG-6471 Reviewed-by: Trond
* | | make it possible to use sse2 with mingwThierry Bastian2010-03-111-1/+1
| |/ |/| | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | Carbon: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | The native file dialog (and finder) handles bundles (like .app) like normal files rather than directories, unless specified otherwise. But since they are directories at the same time, we skip sending them through the name filters. This patch makes sure that we are more consistent on this matter for the carbon port. Task-number: QTBUG-834 Reviewed-by: msorvig
* | Cocoa: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | The native file dialog (and finder) handles bundles (like .app) like normal files rather than directories, unless specified otherwise. But since they are directories at the same time, we skip sending them through the name filters. This patch makes sure that we are more consistent on this matter for the cocoa port. Task-number: QTBUG-834 Reviewed-by: msorvig
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-073-272/+155
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| * | Mac: qfontdialog autotest failesRichard Moe Gustavsen2010-03-051-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is the way we leave modality in the font dialog. When we do, we need to close the non-native qfontdialog as well, but doing so will issue callbacks (like set_visible_sys(false)), that will cause problems. This patch makes sure we wait with such callbacks until the native modal event loop has finished executing Reviewed-by: cduclos
| * | Mac: non-modal native qfontdialog does not work at allRichard Moe Gustavsen2010-03-053-52/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was never implemented, and as it stands, just creating a QFontDialog and calling show on it will not show anything. This patch makes sure that show works, and that one can have more than one font dialog showing at the same time (but only the first one will be native) Reviewed-by: cduclos
| * | Mac: qfontdialog test failsRichard Moe Gustavsen2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The native font dialog on mac did not set the font specified in the non-native font dialog upon exec, but rather qApp->font(). This oneliner sets the correct font, and makes the autotest pass. Reviewed-by: cduclos
| * | Mac: QFontDialog will not sometimes leave modalityRichard Moe Gustavsen2010-03-051-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | It turns out the the code implemented two different ways of entering modality, and mixed the two when it came to exit modality. This patch just uses the nsapp runmodalforwindow approach. Reviewed-by: cduclos
| * | Mac: static getFont functions in QFontDialog does not workRichard Moe Gustavsen2010-03-053-203/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is visible if the static funtions are used before calling qApp->exec(). The reason is that the static functions still use the old code path, rather than the new one (that will end up creating a QFontDialog and call exec on it). Just using the new style will fix the problem. Task-number: QTBUG-7371 Reviewed-by: cduclos
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-063-4/+17
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-051-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build with Mesa 7.8's EGL implementatioon Reset the byte order in the iconv codec after using it. fix "using namespace" recursion crash Fixed key mappings on X11 QDom: prevent infinite loop when cloning a DTD QPrintPreviewDialog number of pages is partially blocked from view in OSX Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
| | * QPrintPreviewDialog number of pages is partially blocked from view in OSXCarlos Manuel Duclos Vergara2010-03-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is caused by the FormLayout. This patch queries the widget for its sizeHint and then forces it to resize to that size. Once that is done, we add the widget to the layout. Code is #ifdef protected so other platforms are not affected by it. Task-number: QTBUG-7760 Reviewed-by: Trond
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-051-3/+3
| |\ \
| | * | Tab to space fixes to qdilaog.cppJanne Anttila2010-03-051-3/+3
| | |/ | | | | | | | | | Reviewed-By: TrustMe
| * | QMessageBox is not stretched to screen width if the content is narrowSami Merila2010-03-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Currently; If content of QMessageBox in S60 is less than messagebox's softlimit, messagebox is not stretched to screen width. http://bugreports.qt.nokia.com/browse/QTBUG-5539 Fix: Regardless of content width, messagebox is stretched to screen width. Task-number: QTBUG-5539 Reviewed-by: Janne Anttila
* | QPrinter: Add Current Page print range supportJohn Layt2010-03-046-138/+159
| | | | | | | | | | | | | | | | | | | | | | | | Support the selection of Current Page option in the print dialog by activating a new QPrintDialog::PrintDialogOption. If selected the PrintRange is set to CurrentPage. It is the responsibility of the application to read the PrintRange and apply the Current Page selection when rendering the pages. Merge-request: 2311 Reviewed-by: Trond
* | remove a warning on windows and simplify a bit the codeThierry Bastian2010-03-031-5/+2
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-265-31/+200
|\ \ | |/ | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * QColorDialog::open() freezes the app the *second* time it is used on MacCarlos Manuel Duclos Vergara2010-02-231-2/+8
| | | | | | | | | | | | | | | | | | The problem here is caused by a boolean flag used to prevent recursion. The flag was set and never reset. This patch resets the flag the moment open is called. Task-number: QTBUG-7825 Reviewed-by: Richard Moe Gustavsen
| * Build fix for 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.Carlos Manuel Duclos Vergara2010-02-221-2/+4
| | | | | | | | | | | | Forgot to add some #ifdef's. Reviewed-by: Richard Moe Gustavsen
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-224-27/+188
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFontDialog::exec() never returns on OSX QNetworkRequest: Doc enhancement Port http example to QNetworkAccessManager loopback network example: Make use of bytesToWrite()
| | * QFontDialog::exec() never returns on OSXCarlos Manuel Duclos Vergara2010-02-224-27/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the fact that this dialog is never meant to be used this way. Instead it should be called through the static function ::getFont(...). I reimplemented this code path and made sure that this works. Task-number: QTBUG-7769 Reviewed-by: Richard Moe Gustavsen
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-202-7/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-181-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | | Replaced the numCopies()/setNumCopies() and actualNumCopies() API.Trond Kjernåsen2010-02-152-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsoleted the numCopies()/setNumCopies()/actualNumCopies() with copyCount()/setCopyCount() and supportsMultipleCopies(). The old numCopies() was confusing since it returned the number of times a job had to be printed to get the copies you wanted. Now copyCount() and setCopyCount() are symmetric, and always returns the number of copies the user want to print. Task-number: QTBUG-5605 Reviewed-by: Kim
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-4/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | | ColorDialog is always shown as stripped-down version (for QVGA)Sami Merila2010-02-191-4/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColorDialog creates own instance of S60Data and fetches touch support value from that. Unfortunately, newly created S60Data is populated with default values that claim no support for touch. As a fix, QColorDialog uses the global variable "S60" to fetch touch support information. Task-number: QTBUG-8322 Reviewed-by: Shane Kearns
* | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| |/ |/| | | | | Reviewed-by: Trust Me
* | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asynchronous deletion of a widget (e.g. calling deleteLater() after a timeout) could be caught by the context menu's event loop if called with exec() instead of popup(). This causes the context menu to be deleted twice in some cases, and a crash generally follows. Although this introduces a minor behaviour change, we now use popup() with the WA_DeleteOnClose attribute to display the context menu in all the contextMenuEvent() bodies, except in those where the menu was already protected by a QPointer. In QDialog::contextMenuEvent(), we use QWeakPointer to reflect the fact that the menu was previously allocated in the stack. QAbstractSpinBox, QDialog and QMdiSubWindow keep using QMenu::exec() in contextMenuEvent() as they need the QAction returned. Some auto-tests included. Reviewed-by: Olivier Task-number: QTBUG-7902
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-2/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
generated by cgit v0.12 at 2025-02-28 05:40:17 (GMT)