summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Documentation fixesBill King2009-11-231-24/+68
| | | | Changed html tags over to qdoc tags.
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-232-2/+25
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Doc.Michael Brasser2009-11-231-1/+1
| |
| * Remove deleted state operations from the state.Michael Brasser2009-11-221-1/+24
| |
* | Tidy (and fix) error messages.Warwick Allison2009-11-231-3/+3
|/
* Fixed the start location of an UiArrayBinding to include the qualifiedId.Erik Verbruggen2009-11-201-1/+1
| | | | Reviewed by: Roberto Raggi.
* Check version for cached DB too.Warwick Allison2009-11-201-0/+2
|
* Fix painting onto devices with no system clip (eg. pixmaps).Warwick Allison2009-11-204-56/+18
| | | | Move pixelCacheSize to PaintedItem (remove its "cacheSize").
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-201-1/+17
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-201-6/+19
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Implement TextInput::horizontalAlignmentAlan Alpert2009-11-201-1/+17
| | | | | | | | | | | | Includes visual autotest.
* | | More SQL tests.Warwick Allison2009-11-201-114/+13
| |/ |/| | | | | Less non-spec functionality in API.
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-1911-113/+36
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-192-7/+0
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Remove unused constructor.Martin Jones2009-11-192-7/+0
| | |
| * | TextEdit ignores unused key navigationAlan Alpert2009-11-191-22/+2
| | | | | | | | | | | | Task-number: QT-2236
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-19469-5204/+7944
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-19481-5258/+8058
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-193-0/+13
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-191-6/+15
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-19471-5229/+8009
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * | | Remove deleted states from the StateGroup.Michael Brasser2009-11-193-0/+13
| | | | | | |
| | | * | | | Remove unused, duplicate methods.Martin Jones2009-11-192-15/+0
| | | | |_|/ | | | |/| |
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-19462-5179/+7910
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Fix GridView scrolling due to currentIndex changes. Add tests.Martin Jones2009-11-191-6/+15
| | | | | |
| | * | | | Set initial frame for remote image sources once they are loaded. AlsoBea Lam2009-11-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | add more tests.
| * | | | | Remove useless, untested methods from QmlGraphicsTextEditAlan Alpert2009-11-192-59/+0
| | |/ / / | |/| | | | | | | | | | | | | I don't think we'll need to expose QTextCursor for QML.
* | | | | Clean-up SQL tests to not be order-dependentWarwick Allison2009-11-191-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Add tests for new SQL APIs Remove some non-useful SQL API extensions.
* | | | | Fix for empty query results.Warwick Allison2009-11-191-2/+5
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-195-18/+31
|\ \ \ \ | |/ / / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-191-1/+1
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-198-40/+89
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | Rename QML Object to QtObjectAaron Kennedy2009-11-191-1/+1
| | | |/ / | | |/| |
| * | | | Add Image auto testMartin Jones2009-11-194-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Also fix qmlpixmapcache error reporting and Image and BorderImage progress reporting for null images.
| * | | | Remove small inefficiency.Martin Jones2009-11-191-1/+2
| | |/ / | |/| |
* | | | Remove duplicateWarwick Allison2009-11-191-4/+0
| | | |
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-19462-5175/+7910
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| * | | Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis
| * | | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| * | | Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-182-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 reports smaller sizes for all fonts which means a lot of the size adjustments QGtkStyle does were now off. I have adjusted most of them including some fixes to menu items themselves. Note that the changes were introduced with this change: 04d18b38c38c5ff623b30366ea08d56128b9b7d0 We now also adapt to GNOME 2.16 style submenu arrow sizes. Combo boxes, line edits, spin boxes and push buttons should finally have a uniform height. Task-number: QTBUG-5753 Reviewed-by: thorbjorn
| * | | Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-182-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for a bug that we introduced with the QGtkStyle refactoring to properly support Maemo5. RevBy: jbache
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-184-119/+107
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-17143-2303/+1989
| | |\ \ \
| | * | | | doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5432
| | * | | | Removing unnecessary chunking and stat'ing when reading QIODeviceJoão Abecasis2009-11-171-54/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chunk size increased to QIODEVICE_BUFFERSIZE (currently 16k) where chunking is still needed. Namely, on sequential devices and when QByteArray is unable to allocate a large enough buffer. This is necessary for backward compatibility Improved validation and prevention of overflow in maxSize argument. Updated autotest that relied on a null QByteArray when no data was available and no errors were found. The only guarantee we should be providing in this case is an empty result -- even though that behavior is preserved for the time being. Affected functions: * QIODevice::read(qint64 maxSize) Chunking will still happen for large maxSize (i.e., QByteArray resize fails), where it could be used as a synonym for QIODevice::readAll(). No stat'ing performed. Read from device continues for as long as it is successful. Stops if an error occurs or if we get less data than requested. * QIODevice::readAll() Chunking is performed for sequential devices where total size wouldn't be known beforehand. For sequential devices, reading continues as long as data is returned, even if less than requested. Non-sequential devices will be stat'ed once. If QIODevice::size returns 0, this is taken to mean unknown size and chunking is performed. Otherwise, a single read request is made for the specified size. On failure to resize QByteArray, nothing is returned. * QIODevice::readLine(qint64 maxSize) Chunking is performed for maxSize == 0, or if we can't allocate a large enough buffer. No stat'ing performed at this level. Read from device continues until EOL is found, as long as we get all requested data. Task-number: QT-2347 Reviewed-by: Thiago Macieira Reviewed-by: Miikka Heikkinen
| | * | | | Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing nothing to a file, not actually writing anything is not an error. Also, from a change introduced in the same commit, there is no point in checking for EOF when writing. Task-number: QTBUG-5847 Reviewed-by: Olivier Goffart
| | * | | | Fix QIODevice::getChar optimizationJoão Abecasis2009-11-171-46/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Text mode there would be a huge penalty on each '\r' found even if the internal buffer was not exhausted, because we would repeatedly remove the '\r' from the buffer and put it back it. Before following through to the unoptimized code, anyway. Instead, we now loop over the internal buffer until we find a suitable character. Reduced code duplication by having QIODevice::getChar directly call QIODevice::read and letting compilers do their job. Reviewed-by: Markus Goetz
| | * | | | Remove needless loop in QIODevice::seekJoão Abecasis2009-11-171-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Either the buffer has more data than is being skipped and it can be cleared or it doesn't and we must skip it. If the total size of QRingBuffer exceeds INT_MAX there'll be bigger problems (e.g., QRingBuffer::size() will overflow) that can only be handled there and there's no point trying to work around them here. Reviewed-by: Markus Goetz
| | * | | | There should only be one write buffer at a time in QFileJoão Abecasis2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be sure, we should explicitly use the size of that buffer and not the whole QRingBuffer when flushing the data. With this change, we make violations of the one-buffer-rule explicitly fail on flush(), but we avoid corrupting data and reading past the buffer's end. Reviewed-by: Markus Goetz
| * | | | | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed with the legal team: * Removed the confusing sentence about the LGPL version. * Replaced the use of "Lesser" with "Library" * Use the same notice for QtWebKit and QtScript Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
generated by cgit v0.12 at 2025-02-08 20:43:48 (GMT)