summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-051-1/+1
| | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-051-3/+1
| | | | | | | | | The point in keeping this behaviour seems limited, and it is causing a bug on touch-screens where there are no mouse moves. Task-number: QTBUG-7907 Reviewed-by: ogoffart Reviewed-by: Thierry
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-045-11/+40
|\ | | | | | | | | | | | | | | | | 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 git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-036-24/+47
| |\
| | * Remove PrintDialog frame on MacJens Bache-Wiig2010-02-021-1/+5
| | | | | | | | | | | | | | | | | | | | | On the mac, toplevel windows should not have a frame. This patch simply removes the frame on mac only. Reviewed-by: trond
| * | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-034-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.David Faure2010-02-022-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using TextSelectableByMouse or TextSelectableByKeyboard, this allows to programmatically control the selection. Needed in KDE's KSqueezedTextLabel, so that mouseReleaseEvent can get the selection and copy the un-squeezed text instead of the squeezed one. Merge-request: 454 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-015-23/+42
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
| * | Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-272-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
| * | Carbon: deleting a QMenu while it's open will cause a crashRichard Moe Gustavsen2010-01-271-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | This patch closes the menu bar if it's open when it gets destroyed Task-number: QTBUG-6597 Reviewed-by: cduclos
| * | Cocoa: qaccessibility test crashesRichard Moe Gustavsen2010-01-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 4.6Martin Smith2010-01-271-3/+9
| |\ \
| | * | Crash when deleting QMainWindow with native toolbar on Cocoa.Prasanth Ullattil2010-01-251-3/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens while processing a paint message received by the NSToolbar after the corresponding QToolbar has been destroyed. So while cleaning up the toolbar, the view needs to be detached from the custom toolbar item. Task-number: QTBUG-7305 Reviewed-by: Carlos Manuel Duclos Vergara
| * | doc: Corrected some bad grammar.Martin Smith2010-01-271-4/+3
| |/ | | | | | | Task-number: QTBUG-7640
* | Merge branch '4.6'Thiago Macieira2010-01-211-0/+11
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | | | | | | | | | | | | | | | The QCocoaToolBarDelegate is not released when destroying the QMainWindowLayout. Task-number: QTBUG-7307 Reviewed-by: Prasanth Ullattil
* | Merge branch '4.6'Thiago Macieira2010-01-183-7/+12
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-14156-162/+175
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-141-2/+5
| | |\ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.1
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-131-3/+13
| | | |\
| | | * | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| | * | | Make compile on symbian/LinuxThomas Zander2010-01-131-1/+1
| | | |/ | | |/| | | | | | | | | symbian headers on Linux are lowercase and this should work on Windows too.
| * | | Make input mask cursor blinkAlan Alpert2010-01-141-4/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7174 Reviewed-by: Leo
* | | | Merge branch '4.6'Thiago Macieira2010-01-13156-159/+169
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-12156-156/+156
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: dist/changes-4.6.1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-07156-156/+156
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | | * Update copyright year to 2010Jason McDonald2010-01-06156-156/+156
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Significant digits were lost in QDoubleSpinBox range when changing precisionGabriel de Dietrich2010-01-121-3/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the range, the actual value precision was lost because the min and max were saved after being formatted to the current precison (decimals property), thus losing information. We now keep the user original values, and use these whenever the decimals property is changed. Auto-test included. Reviewed-by: leo Task-number: QTBUG-6496
* | | Cocoa: refactor code for clearing the native menu barRichard Moe Gustavsen2010-01-131-43/+30
| | | | | | | | | | | | | | | | | | | | | It turns out that some of the code executed when synching then menu bar was already implemented in the function that clears the menu bar. So this patch makes the code a bit more compact, avoiding implementing the same code twize.
* | | Cocoa: the menu bar is sometimes faulty disabledRichard Moe Gustavsen2010-01-121-49/+106
| | | | | | | | | | | | | | | | | | | | | In Qt, we allow the menu bar to be enabled if we only have one exec-ing dialog on screen. That way you can reach the quit menu item to close down the application. But in order for this to work, some overhaul of qmenu_mac.mm was need to teach it these rules.
* | | Cocoa: application will not quit when using dialogsRichard Moe Gustavsen2010-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a single dialog in the main function, and tell it to exec, we run a modal dialog. But there is really no other window on screen to be modal for. So in that case, since this is a rather common pattern for Qt applications, we allow users to quit the application from the dock. But this action is sendt as an apple event. And and that point in time, cocoa has the the apple event handler, and refuses to close down the application because it detects a modal window. Our solution is to install/overwrite the apple event handler for kAEQuit _after_ cocoa has finished its own installation. But in order to do this, we need to wait until [NSApplication run] has started, otherwise it will not take effect. And that is what this patch essentially does.
* | | Merge branch '4.6'Thiago Macieira2010-01-082-8/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-061-0/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits) QBoxLayout::setGeometry would not respect the widget min/max width Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border." Use QFile:rename when moving items in QFileystemModel. Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram" Fix default filter selection when using HideNameFilterDetails option. Don't write out fo:word-spacing if its the default value. Improved initial startup time for a QGLWidget ontop of EGL/X11. Document the QGraphicsView::IndirectPainting flag Display broken symlinks in the filesystem model. Fix typo in autotest testcase name. Fixed a bug with distribution of spans. Make unit test more robust Compile with QT_NO_DOCKWIDGET Removed temporary QGLWidget created during QGLWidget/X11 initialization. Fix test: The bug is now fixed Fix auto-test failure on Windows QScript: Lookup the native setter from the prototype Implement QScript::QObjectDelegate::getOwnPropertyDescriptor fix compilation in GL2 paint engine for Windows Move QGLTextureGlyphCache into it's own file ...
| | * Compile with QT_NO_DOCKWIDGETOlivier Goffart2010-01-051-0/+2
| | | | | | | | | | | | Task-number: QTBUG-7133
| * | doc: Clarified next and previous activation order.Martin Smith2010-01-051-8/+8
| |/ | | | | | | Task-number: QTBUG-6992
* | QMenuBar::triggered(QAction *) fires twice in Mac (carbon).Prasanth Ullattil2010-01-071-14/+6
| | | | | | | | | | | | | | | | | | The signal was being emitted both from the carbon event handler and the platform independent code of QMenu. The one in the event handler is now removed. Task-number: 6741 Reviewed-by: Richard Moe Gustavsen
* | Don't use QPointer in objectve-c interfaces.Morten Johan Sørvig2010-01-051-2/+2
| | | | | | | | (Constructors and destructors are not called.)
* | Merge branch '4.6'Thiago Macieira2009-12-2611-20/+91
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-221-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 ) Drag and drop icon not updated correctly in Cocoa. Adding missing file. Warn when calling QFileInfo::absolutePath() on an improper object. update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155 Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns. Fix for WinCE compilation of QAbstractSpinBox.
| | * Fix for WinCE compilation of QAbstractSpinBox.David Laing2009-12-211-1/+1
| | |
| * | Edit focus should not be lost unless by explicit actionSami Merila2009-12-211-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | Currently non-touch devices lose edit focus if window switch happens. I.e. in cases when screensaver activates, an incoming call occurs, a global notification is shown... With this fix, edit focus remain active, until user removes the focus explicitly. Task-number: 4792 Reviewed-by: axis
| * Fixing compile issue on Windows CEAleksandar Sasha Babic2009-12-181-3/+1
| | | | | | | | Reviewed-by: TrustMe
| * Fixed two incorrect signal connections.axis2009-12-182-2/+2
| | | | | | | | RevBy: Friedemann Kleint
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-174-5/+18
| |\
| | * Text cursor is not shown properly in line edits on Mac OS X.Prasanth Ullattil2009-12-163-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mac stlye disables the blinking cursor when there is a selection in the line edit. The cursor is not shown back when this selection is removed (either by mouse or key press events). This patch watches the selection changed signal from the line control and updates the cursor status accordingly. Task-number: QTBUG-6378 Reviewed-by: Olivier Goffart
| | * Calling removeToolBar() on native Mac toolbars (Cocoa) causes crash.Prasanth Ullattil2009-12-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The hash and the list which stores the references are already cleared by the delegate function toolbarDidRemoveItem: There is no need to remove them manually after a call to [NSToolbar removeItemAtIndex]. Task-number: QTBUG-6200 Reviewed-by: Richard Moe Gustavsen
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-167-14/+70
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits) Fixed qstylesheetstyle benchmark for Symbian Fixed qdiriterator benchmark for Symbian Fixed events benchmark postEvent function Fix for QTBUG-4908 SVG transparency rendering problem. Long informative texts causes messagebox to grow outside of screen area qreal-ization qreal-ization qreal-ization QS60Style: Remove layouts with mirrored information Fixed qgraphicsview autotest build for winscw. Enabled input method update code for all platforms. (ODBC) Fixes segfault when error string is larger than 256 chars. Fixed QGraphicsView benchmark for Symbian. FEP indicator shown in status pane when it should not Skipped the most memory intensive tests in QByteArray benchmark. qreal-ization qreal-ization QS60Style: Theme graphics for QSlider in 3.1 QS60Style: Groove changes caused build break of S60 3.1 Slow spinbox on N95 when using keys Up/Down ...
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-165-4/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | * | | qreal-izationAleksandar Sasha Babic2009-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using math wrapper functions instead direct call. This gives us top-level control to what (single/double) precision we are effectively using. Task-number: QTBUG-4894 Reviewed-by: janarve Reviewed-by: Kim Motoyoshi Kalland
| | * | | Merge branch 'mergeRequest-2149' into 4.6-s60axis2009-12-153-0/+6
| | |\ \ \