summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-09459-533/+657
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| * Reverted two commits that were pushed to the wrong branch.Denis Dzyubenko2010-01-083-59/+13
| | | | | | | | | | | | | | | | Revert "Use the new QTextCodec api in the QXmlStreamWriter." This reverts commit fdac6df6d46e6d4f00763365de5a4437ad06ba39. Revert "Added new functions to QTextCodec that accept ConversionFlags." This reverts commit 7fb78e7f60ea72e9e471d6cbc4403d490581df17.
| * Use the new QTextCodec api in the QXmlStreamWriter.Denis Dzyubenko2010-01-082-10/+2
| | | | | | | | | | | | | | | | | | | | | | Instead of accesing private data, use the QTextCodec::makeEncoder() to pass the initial conversion flags to the codec. Also improved the behavior - we shouldn't add BOM in the middle of the data when dumping xml in all encodings, not only for utf8. Task-number: QTBUG-7180 Reviewed-by: Thiago
| * Added new functions to QTextCodec that accept ConversionFlags.Denis Dzyubenko2010-01-082-3/+57
| | | | | | | | | | | | | | | | | | | | In some cases the user might want to pass initial conversion flags that should be used by the QTextEncoder and QTextDecoder, so added convenience QTextCodec::makeDecoder and makeEncoder functions that accept those flags as an argument. Task-number: QTBUG-7180 Reviewed-by: Thiago
| * Avoid repeatedly calling LookupAccountSid in QFSFileEngine::ownerRitt Konstantin2010-01-071-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | Try to retrieve user/group name in a single call to LookupAccountSid, by using pre-allocated buffers. Only call a second time if the buffer size is insufficient. 64 bytes should be enough in common case. Previously, we would always call LookupAccountSid twice, even if ERROR_NONE_MAPPED occured first time. Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * improve readability a bit moreRitt Konstantin2010-01-071-8/+8
| | | | | | | | | | Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * fix styling; improve readabilityRitt Konstantin2010-01-071-36/+33
| | | | | | | | | | | | | | | | | | | | * tabs -> spaces; * if( -> if ( * some strings rearranged. no code changes! Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * make it possible to retrieve name of the user who owns the fileRitt Konstantin2010-01-071-1/+2
| | | | | | | | | | | | | | QFSFileEngine::owner(OwnerUser) now works as expected Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * Fix bugs evidenced by change to keep flush errors on QFile::closeJoão Abecasis2010-01-072-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When closing a file, the contents of the write buffer should be emptied even in the case where flush fails, so it doesn't leak to subsequent files opened through the same instance. This is inline with what would happen with native close on a buffered device. Also changed the resource file engine to succeed on flush. Since all writes fail there, logically it's write buffer is empty and flush should succeed. This keeps auto-tests happy :-) tst_QFile::fullDisk auto-test extended to ensure re-opening QFile does not keep the write buffer alive. Reviewed-by: Thiago Macieira
| * Don't drop errors from flush on QFile::closeJoão Abecasis2010-01-071-3/+6
| | | | | | | | | | | | | | | | | | Now that we don't defer to the file engine for the write buffer it is doubly more important to retain errors from flush. The logic employed reproduces what we already had in QFSFileEngine::close, earliest error stays. Reviewed-by: Thiago Macieira
| * Avoid double-buffering in QFileJoão Abecasis2010-01-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 4.3 QIODevice has been providing read buffering for buffered devices; QFile provides a write buffer. Thus, requesting a buffered file from the engine results in unnecessary double-buffering where this is supported natively. By preferring QFile/QIODevice's buffering over the file engine we reduce the number of system calls. On the other hand, buffering inside QIODevice can't easily be disabled without changing the return value of QIODevice::openMode() (function is non-virtual). Reviewed-by: Thiago Macieira
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-071-0/+2
| |\
| | * Prospective Qt/Mac build fixSimon Hausmann2010-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | On Mac/32 QXmlStreamWriter is actually QCoreXmlStreamWriter, so the friend declaration in QTextEncoder to access the private state needs to cover that class, too. Reviewed-by: Prasanth
| * | doc: Removed incorrect \inmodule command.Martin Smith2010-01-071-2/+0
| |/ | | | | | | Task-number: QTBUG-6606
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-07459-481/+589
| |\
| | * Make an empty QUrl also be considered non-detached (d == 0).Thiago Macieira2010-01-071-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Improve QUrl constructing performance by making empty URLs have d==0.Thiago Macieira2010-01-071-15/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One major cost is that QUrl::d is never 0 (even for default constructor). While this simplifies the code, it has a real performance impact, since QUrlPrivate is quite expensive to create (14 QString/QByteArray members, plus others). In a simple test of the QML flickr demo, 1 in 3 QUrlPrivate objects that were created were never used before being deleted. According to callgrind, this reduces cost of QUrl+QUrlPrivate by 25% in the case tested. Patch-by: Warwick Allison Reviewed-by: Thiago Macieira
| | * QIODevice: Fix readAll()Markus Goetz2010-01-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | My patch from yesterday did not have any effect: Instead of really using what was in the buffer, it used it but then read it from the underlying device anyway. Thanks Ritt Konstantin and Joao. Reviewed-by: joao
| | * Temporary hackiesh solution to prevent BOM in the xml data.Denis Dzyubenko2010-01-062-2/+5
| | | | | | | | | | | | | | | | | | | | | We don't want to have byte-order-mark in the middle of the written string. Task-number: QTBUG-6893 Reviewed-by: Thiago
| | * Update copyright year to 2010Jason McDonald2010-01-06459-462/+462
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | doc: Added enum values to table for Qt 4.5 and 4.6.Martin Smith2010-01-071-6/+8
| |/ | | | | | | Task-number: QTBUG-7156
* | Added a flag to avoid construction of application panes.axis2010-01-082-0/+7
| | | | | | | | | | | | | | | | | | This is purely an optimization for fullscreen-only apps. Task: QTBUG-6098 RevBy: Jason Barron RevBy: mread AutoTest: Included
* | Fixed a doc error.axis2010-01-081-1/+0
|/ | | | | | The extra line would make qdoc treat the next text as a separate paragraph, but it should be part of the description for the previous value.
* doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
| | | | Task-number: QTBUG-6615
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-051-2/+10
|\
| * Small optimization in QIODevice::readAll()Markus Goetz2010-01-051-2/+10
| | | | | | | | | | | | .. and more testcases Reviewed-by: joao
* | doc: Added some missing macro descriptions.Martin Smith2010-01-051-4/+27
|/ | | | Task-number: QTBUG-6769
* Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
| | | | Reviewed-by: TrustMe
* doc: Removed a const from a declaration in the example.Martin Smith2010-01-041-1/+1
| | | | Task-number: QTBUG-7092
* QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-281-5/+9
| | | | | | | | | | QUrl::setPassword() without QUrl::setUserName() is actually useful, e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly, but QUrl::toEncoded() would forget the password in such a case. Autotest added. Merge-request: 2276 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-262-9/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-252-9/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | * revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845Ritt Konstantin2009-12-232-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as discussed at #qt-labs special dirs should be hidden on unix to preserve qt3-like behavior unhiding those dirs was not a good idea and now i do revert of my changes Merge-request: 1894 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | Fix warning on 64-bit build with MSVC.Thiago Macieira2009-12-251-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-3792 Reviewed-by: Trust Me
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-251-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: FTBFS on hurd-i386 because since clock_gettime is not available there Fix build on ARMv6 when NEON is detected. Add two new mkspecs for SunCC with stlport.
| * | FTBFS on hurd-i386 because since clock_gettime is not available thereSamuel Thibault2009-12-251-0/+3
| |/ | | | | | | | | | | | | | | | | | | qt4-x11 reverts to using gettimeofday, but it doesn't include <sys/time.h> where the latter is defined. Debian bug #533526 Task-number: QTBUG-6961 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-12-233-8/+11
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-222-23/+39
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added more specific clean targets for Symbian builds Fixed incorrect headers. Daylight savings time for Symbian. Tool for launching symbian apps on the phone from windows command line Fixes to winscw def files Fixing compile error on armcc
| * | Warn when calling QFileInfo::absolutePath() on an improper object.Andreas Kling2009-12-211-0/+2
| | | | | | | | | | | | | | | | | | Merge-request: 1821 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-192-8/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| | * | doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-7/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-6288
| | * | Fixed QResource to respect the explicitely set localeDenis Dzyubenko2009-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QResource directly, the loader should respect the locale that the user asked to use for the resource. Reviewed-by: João Abecasis
* | | | Revert "Daylight savings time for Symbian."Janne Koskinen2009-12-232-39/+23
| |_|/ |/| | | | | | | | | | | | | | Reverted due to buildbreak on 3.2 ARMV5 Urel. This reverts commit 2a20705f874ddad55282f22fabfe30927729ae50.
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-12-2219-137/+231
|\ \ \ | |/ /
| * | Optimize QThreadStorage with QVectorOlivier Goffart2009-12-182-48/+51
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThreadStorageData::get might be accessed very often. QMap lookup has proven to be too slow. We can expect about 20 instances of QThreadStorage in a typical applications (tested with some KDE applications) So a QVector is more suited Note: we now re-use the ids. Which means that if the QThreadStorage is destroyed before the QThread, and another one is created, we might get crashes (instead of a warning printed to the console) Reviewed-by: brad
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-175-9/+19
| |\
| | * Avoid timer starvation when handling many X11 eventsBradley T. Hughes2009-12-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57, timers are normally run at idle priority. This makes it possible for the X11 handler to starve timers indefinitely. Fix this by enforcing one normal priority pass of the timer source after we have processed all X11 events. This has the added benefit of keeping animation timers smooth and consistent, which is the intention of this change. Reviewed-by: Jens Bache-Wiig
| | * An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Using QLocale::operator== is faster than comparing languages, because when getting a language from a default constructed QLocale object, it initializes the system locale and quieries the system which languge it supports. Reviewed-by: Olivier Goffart
| | * Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | | | | | | | | | | | | | | | | | | | | We already convert date/time format inside the getMacDateFormat, so no reason to do it again later. Reviewed-by: Prasanth
| | * Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-167-173/+17
| | | | | | | | | | | | | | | | | | Revert a change that is not yet complete and was pushed by mistake. This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
generated by cgit v0.12 at 2024-12-08 23:16:39 (GMT)