summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge branch '4.6'Thiago Macieira2010-01-084-10/+42
|\ | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * 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
* | Don't use QTime::elapsed() on windows to query for the actual time.Jan-Arve Sæther2010-01-082-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the time spent between the execution of QTime::start() and QTime::elapsed() can be higher than what QTime::elapsed() sometimes reports. (To put it differently, QTime::elapsed() was sometimes returning a time that was *less* than the actual time spent.) Note that this is *not* a bug on Windows, since GetLocalTime explicitly mentions that we should not use local system times to to relative comparisions (this is what elapsed() currently do). This is also partly reflected by the documentation of QTime::elapsed(), where it says that the result of elapsed() is undefined if the clock setting has been changed. Due to the fact mentioned in the above paragraph this is also a potential problem on other platforms (at least Linux and Mac). However, these platforms do not suffer from the immediate problem we observed on windows (that QTime::elapsed() could return a too small value), so this commit only fixes the problem on Windows (it now uses GetTickCount instead of QTime). For the other platforms the behaviour should be unchanged, since we still use QTime. This was found by running the QPauseAnimation autotest, where some tests were unstable (and failed). However, it did not fail on all windows systems. (Luckilly it failed on my Win 7 system) Reviewed-by: Leo
* | Qt 5 comment added for QT_WA / QT_WA_INLINE removalJoerg Bornemann2010-01-061-0/+1
| |
* | Our variables are our variables so we prefix them.Alexis Menard2010-01-061-1/+1
| | | | | | | | | | | | AUTODETECT_COCOA -> QT_AUTODETECT_COCOA Reviewed-by:thiago
* | Merge branch '4.6'Thiago Macieira2010-01-053-14/+14
|\ \ | |/ | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * 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>
* | | | Merge branch '4.6'Thiago Macieira2009-12-2615-133/+220
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | | 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.
| | | * Changes to support locale change event for symbian platformdka2009-12-157-17/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subscribing to the locale change notification to be able to update the system locale whenever the user changes the current system locale. Also changed the initialization of the system locale to make construction of the QLocale object as lightweight as possible. So now the default contructor just creates a QLocale and QSystemLocale objects, but doesn't try to fill the cache in the latter with data from the system and postpones it until it is actually requested (most applications create QLocale objects on the stack and might not even use the data from the system locale, so we don't need to initialize system locale right away). Modified-by: axis Modified-by: Denis Dzyubenko Reviewed-by: Denis Dzyubenko Reviewed-by: axis
| | | * Fix compilation on HP-UX 11.11.Tristan Chabredier2009-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: thread/qthread_unix.cpp: In static member function 'static int QThread::idealThreadCount()': thread/qthread_unix.cpp:325: error: aggregate 'pst_dynamic psd' has incomplete type and cannot be defined thread/qthread_unix.cpp:326: error: 'pstat_getdynamic' was not declared in this scope Task-number: QTBUG-6576 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-162-47/+111
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1610-15/+28
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | | * | | qreal-izationAleksandar Sasha Babic2009-12-151-45/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Symbian Math package. Benhcmarks are showing that some Symbian native math functions (trigonometric, exp, pow ...) are faster then their Open C counterparts. Task-number: QTBUG-4894 Reviewed-by: Iain
| | * | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-145-5/+20
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix QMetaObject::connect and disconnect with "dynamic signals"Olivier Goffart2009-12-142-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML might pass index that are larger that the method cound. We must not call QMetaObjectPrivate::originalClone in that case as this would read invalid memory Reviewed-by: brad
| * | | | | Daylight savings time for Symbian.Janne Koskinen2009-12-222-23/+39
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ask DST from Symbian's timezone server. This commit makes datetime functions slower. Small room for optimisation with keeping the server connection always open. Task-number: QTBUG-6859 Reviewed-by: Aleksandar Sasha Babic
| * | | | qreal-izationAleksandar Sasha Babic2009-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some places we do have direct math related calls. Almost all are calling the double precision functions even if the args and results are float. This leads to unnecessary float->double and double->float transitions. By using wrapper functions we can control which functrion variants are effectively called. Task-number: QTBUG-4894 Reviewed-by: Shane Kearns
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-114-6/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
* | | | | | Revert "remove obsolete QT_WA/QT_WA_INLINE macros"Joerg Bornemann2009-12-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be on the safe side wrt source compatibilty, we'll postpone the QT_WA / QT_WA_INLINE removal for Qt 5. This reverts commit c5e5998bec4aafca555543d1ef3c335f7b280294.
* | | | | | remove obsolete QT_WA/QT_WA_INLINE macrosminiak2009-12-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1627 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadLibraryW -> LoadLibrary RegOpenKeyExW -> RegOpenKeyEx qdesktopservices_win.cpp: buffer size fixed in launchWebBrowser() Windows NT 4.0 version condition removed Merge-request: 1627 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-1513-41/+64
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-147-23/+39
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
generated by cgit v0.12 at 2024-12-29 10:18:21 (GMT)