summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-268-19/+35
|\ | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-2/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-231-1/+1
| | | |\
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-201-1/+1
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-202-2/+3
| | | |\ \ \
| | | * | | | Doc: Fixed minor documentation issues.David Boddie2010-10-121-2/+2
| | | | | | |
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-255-16/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If native side uses "bottom softkeys" with landscape orientation, QComboBox's popup should be shown above softkeys and centered. Currently it is shown above softkeys and on right border. Task-number: QT-4174 Reviewed-by: mread
| | * | | Fix autotest failure with experimental client decoHarald Fernengel2010-10-201-1/+1
| | | |/ | | |/| | | | | | | | | The menu bar is in the outer layout, not the inner one
| | * | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e378145294da33495d48b2c0742461ae6c2a3ba. QWorkspace is obsolete. And it does not pass the tests. TESTFUNCTION_FAIL tst_qaccessibility::workspaceTest (macx-g++_cocoa) TESTFUNCTION_FAIL tst_qaccessibility::workspaceTest (macx-g++_cocoa_osx106)
| | * | Disable the unified toolbar before enteringFabien Freling2010-10-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fullscreen on Mac OS X. We are just enforcing what the documentation recommended. Task-number: QTBUG-13772 Reviewed-by: Samuel
| | * | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The setMinimumSize call was having precedence over the minimumSizeHint, so when having a sizegrip enabled it was possible to resize a MDI window to a much smaller size than its min size (actually it would flicker between the two sizes, on each resize). Fixed by moving that min size (for the titlebar contents) to the calculations in minimumSizeHint(). Reviewed-by: mariusso
| | * Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-14026 Reviewed-by: David Boddie
| | * Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | |\
| | | * Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into ↵Jerome Pasion2010-09-1611-48/+124
| | | |\ | | | | | | | | | | | | | | | 13092010doc
| | | * | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Bug:QTBUG-11324
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-211-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix linux-clang license header Add mkspecs for Clang on Linux and Mac OS X Handle Objective-C/C++ sources in SOURCES gracefully configure: Don't use character class when looking for QMAKE_CONF_COMPILER removed shlobj.h to prevent different redefinitions for Windows Embedded 7 enums are defined as typedefs for Windows Embedded 7 windef.h needs to be include before types.h for Windows Embedded 7 defines GID_* for Windows Embedded 7 WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7 SPI_GETPLATFORMTYPE not defined for Windows Embedded 7 Make QCompleter return current parent instead of invalid index make QFileDialog completer return proper dirnames in root Make sure QGraphicsSceneHoverLeave event has non-null widget pointer. Designer: Enable morphing into QTextBrowser.
| | * | | | windef.h needs to be include before types.h for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-223-5/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | | | | Fix the #ifdef position.Fabien Freling2010-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Tor Arne Vestbø
| * | | | | Enable the unified toolbar with the rasterFabien Freling2010-10-192-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | engine only in the Cocoa port. Reviewed-by: Tor Arne Vestbø
| * | | | Remove references ofFabien Freling2010-10-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qunifiedtoolbarcontainer_mac_p.h Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | | Experimental support of the unified toolbar withFabien Freling2010-10-083-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the raster engine on Mac OS X. Task-number: QTBUG-12615 Reviewed-by: Samuel Rødal
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-054-11/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-0/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-11/+17
| | |\ \ \
| | * | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13734 Reviewed-by: Jerome Pasion
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-282-11/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (83 commits) Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus. Document PropertyAnimation::targets property Fix test. QHostInfo: Fix a crash when a new request is pushed while resolving. Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2 Fix a compilation issue of tst_qsettings for win32-msvc. fix RSS listing example QML Debugging: Documentation fixes dist/changes: QML Debugging changes Updated changes-4.7.1. Do not set DESTDIR to the current directory Small fixes to Browser.qml Fix dependency on the plugins rule for multimedia More declarative autotests. Fix example. Assistant: Don't register internal doc when using custom collection. Assistant: Move comment to the right place. ...
| | * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-11/+17
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| | | * | | | Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll
| * | | | | Fix a color propagation issue with Combobox line editJens Bache-Wiig2010-09-281-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some pixmap based themes were affected by this issue since they needed to resolve the palette against the widget and the lineedit palette was already resolved. We now set the palette on the lineedit when you modify the parent palette. You can still maintain a separate palette on the lineedit, but you have to set it after the parent has been set. We can remove some workarounds for plastique and vista style due to this. Task-number: QTBUG-5950 Reviewed-by: ogoffart
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2710-52/+123
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2110-52/+123
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * | | Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-201-4/+4
| | | |/ | | |/| | | | | | | | | | | | | Task-number: QTBUG-13437 Reviewed-by: Janne Koskinen
| | * | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-158-46/+117
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| | | * | Implement a private API for setting title widgetsHarald Fernengel2010-09-108-46/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meego and Orbit use client side decorations, so implement a top-level layout in QMainWindow that allows us to set title widgets. To prevent regressions on other platforms, the API is disabled by default. Rev-By: Robert Griebl Rev-By: Thierry Bastian
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-093-2/+7
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | * | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-4/+2
| | |\ \
| | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-2/+2
| | |\ \ \
| | | * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-135-22/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-104-19/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-092-2/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | | * | | | Editable QComboBox popup immediately closes itself after a clickSami Merila2010-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that timer that blocks for while mouse release events (blockMouseReleaseTimer) is not started. There is an optimization in QComboBox that tries to avoid calling d->viewContainer() since that method creates the viewContainter if it doesn't exist. Unfortunately this optimization does not take into account if the container is already created. In this particular case, viewContainer is already created, but since QComboBox creates a QLineEdit, it skips the timer start, which leads to situation where combobox's popup menu receiving mouse release event and thus closes itself. As a fix, blockMouseReleaseTimer is started if the viewContainer is already created. Task-number: QTBUG-13231 Reviewed-by: axis
| | | * | | | Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit, cursor is still visible. QLineControl (text control widget inside QLineEdit) handles the internal state of cursor visibility correctly and then promptly ignores the state when drawing the text. Issue is corrected by checking the cursor visibility state when drawing the cursor into widget. Task-number: QT-3670 Reviewed-by: axis
| | * | | | Fixed the scrolling of text in QLineEdit with right alignmentThierry Bastian2010-09-091-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scrolling internal member was not changed in cas the text was bigger than the lineedit. Task-number: QTBUG-13520 Reviewed-by: gabi
| | * | | Revert "QLineEdit cursor is shown when asked to be non-visible"axis2010-09-021-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
generated by cgit v0.12 at 2025-01-18 18:42:51 (GMT)