summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-143-1/+6
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-071-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc doc/src/platforms/platform-notes.qdoc src/corelib/tools/qlocale_symbian.cpp src/gui/kernel/qwidget_p.h src/network/access/qnetworkaccesshttpbackend.cpp src/opengl/qgl.cpp src/plugins/bearer/symbian/qnetworksession_impl.cpp
| | * QLineControl: selectedTextChanged() signal is omitted in some casesSami Merila2011-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLineControl does not emit selectionChanged() signal when selection is changed due to handling of input method query. As a fix, the signal is emitted when internal values for selection end and beginning are changed in processInputMethodEvent(). Additionally, added deselect() test case for both QDeclarativeTextEdit and QDeclarativeTextInput to help out autotesting of text selections. Note that there are some differences in the QLineControl and QTextControl implementations. This causes the different signal counts even if the test steps are similar. Task-number: QTBUG-21429 Reviewed-by: Miikka Heikkinen
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add integrity gbuild to the project file for convenience don't build activeqt examples on mingw QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined. Updated Russian translation Ukrainian translation updated for 4.8 retreving -> retrieving Removed duplicate Spectrum Analyzer entry from demos doc page. Removed obsolete QWS_ALPHA_CURSOR feature. Removed duplicate link from QFinalState documentation. Clarified keypad navigation specific event documentation. docs: Typo and link fixes. Use the right callback in QObject::disconnect()
| | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-281-0/+8
| | |\ \
| | * | | docs: Typo and link fixes.jaanttil2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-031-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added text about -random and -seed options in QTest to changelog Add another part of the source code to the snippet. Update changes-4.8.0 Update translation sources. Update the changelog for qdoc in 4.8
| | * | | Add another part of the source code to the snippet.Casper van Donderen2011-09-301-0/+1
| | |/ / | | | | | | | | | | | | Fixes: QTBUG-21765
* | | | Converting from double to qreal in guimread2011-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a number of places in QtGui where doubles were used in expressions due to the use of floating point constants in the code. Many of these constants are now constructed as qreal, removing the use of double operations where unneeded. These changes have been limited to constants that have exactly the same value whether double or float, to ensure that precision errors are not introduced. This should not affect any of the desktop platforms where qreal is double. On Symbian, where qreal is float, appropriate autotests have been run. Task-number: QTBUG-4894 Reviewed-by: Sami Merila
* | | | Fix QTextBrowser autotest to use "file" scheme in URLs.Miikka Heikkinen2011-09-281-1/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A security fix to QUrl that causes it to no longer interpret URLs without scheme as local files broke QTextBrowser test case. Added the necessary "file" schemes to URLs used in the test. Also added a mention about necessity of using "file" scheme to QTextBrowser documentation. Task-number: QT-5286 Reviewed-by: Sami Merila
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-221-0/+8
|\ \ \ | |/ / |/| |
| * | Fix the incorrect sizeHint given by QLabel on SymbianJarkko T. Toivonen2011-09-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Using the S60 clientRect width in the QLabel size hint calculation (instead of assuming that 80 characters will fit on one line). Task-number: QTBUG-14318 Reviewed-by: Murray Read
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-081-4/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Split CFLAGS from pkg-config properly Ensure that the proxystyle is used over the style's own functions runonphone: Add a missing space between a message and the file name Perl check for windows configure. QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QSettings: use the common appdata dir when bootstrapping qmake on win Replace explicit surrogate handlers by inline methods of QChar class
| * | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-071-4/+2
| | | | | | | | | | | | | | | Merge-request: 1284 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0310-24/+514
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| * | | Update license headersGabriel de Dietrich2011-09-013-54/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f Reviewed-by: Frederik Gladhorn Merge-request: 1254
| * | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-311-1/+1
| |\ \ \ | | |/ /
| * | | Merge branch '4.8' into water-team-masterFrederik Gladhorn2011-08-3110-24/+511
| |\ \ \
| | * | | Introduce menubar plugin systemAurélien Gâteau2011-06-204-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | * | | Introduce QAbstractPlatformMenuBarAurélien Gâteau2011-06-206-11/+457
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | * | | Hide Q<Platform>MenuActionAurelien Gateau2011-06-205-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help abstracting the platform specific parts of QMenuBarPrivate in a common interface. Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | * | | Fix warning about initialization orderAurélien Gâteau2011-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-311-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| * | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-293-6/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| * | | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-312-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | Conflicts: doc/src/index.qdoc
| * | | Fix delayed password masking mid-string.Andrew den Exter2011-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unmask the last character typed, not the last character in the string. Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c Task-number: QTBUG-17003 Reviewed-by: Alan Alpert (cherry picked from commit b98e9e69dd8ba33d5f01b9518d95b63b86c4b443) Reapplied after bad v4.7.4 merge
| * | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19919 (cherry picked from commit 26c29a2dd7efa4c66063d1255e1f694462cbae85) Reapplied after bad v4.7.4 merge
* | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-263-6/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-242-5/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-241-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: In landscape mode QComboboBox popup can not be showed completely
| | * | | In landscape mode QComboboBox popup can not be showed completelySami Merila2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox popups have regressed in 4.7.4 lately. Combobox popup is shown as smallish square rectangle in landscape orientation. As a fix, let the width of the popup match the height of the screen (native dialogs most of the time have width matching the height of the screen). Task-number: QTBUG-20932 Reviewed-by: Miikka Heikkinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-181-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. qdoc: Fixed QTBUG-19338
| | * | | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-06-161-0/+2
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-19919
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-171-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-171-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Unmask the last character typed, not the last character in the string. Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c Task-number: QTBUG-17003 Reviewed-by: Alan Alpert
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Don't leak MouseEvents
| * | | | Don't leak MouseEventsAlan Alpert2011-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based off merge request 1312 Reviewed-by: Michael Brasser
* | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-041-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-021-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QLabel documentation: add warning about sanitizing input
| | * | | | QLabel documentation: add warning about sanitizing inputPeter Hartmann2011-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make users more aware of QLabel guessing the text format. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-2910-3/+115
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-07-222-0/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Remove testing for Hide of mainwindow. Fix accessibility test for QWS. Fix test for win and mac. Add constants to QAccessible::Event enum. Call QAccessible::updateAccessibility when setText is called on QLabel Fix autotest for accessible tables. Style cleanup - space after flow control keywords. Add IAccessible2 table2 implementation. Fix a crash with QGraphicsScene. Use name for combobox on Unix. QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)
| | * | | | | Call QAccessible::updateAccessibility when setText is called on QLabelJosé Millán Soto2011-07-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is called when the text of a label is changed and setAccessibleName has not been called on the label, as the text of the label acts as the accessible name of the label. Merge-request: 1301 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | * | | | | Use name for combobox on Unix.Frederik Gladhorn2011-07-121-0/+18
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more conforming to the AT-SPI specs. Also we have working relations for the label when a buddy is set. Reviewed-by: Gabi
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-202-3/+77
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| | * | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-192-3/+77
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an integer value in milliseconds, QLineEdit and TextInput will display the last character entered unmasked for that delay period and then mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is not defined then the behaviour is unchanged. Change-Id: I55f527932d34453828caba88e93ad57e012e79be Task-number: QTBUG-17003 Reviewed-by: Martin Jones
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17156-2652/+2652
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | | * | Update licenseheader text in source filesJyri Tahtela2011-05-13156-2652/+2652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-085-0/+9
| |\ \ \ \