summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Optimized QLocale to access system locale on demand."Denis Dzyubenko2010-02-173-143/+46
| | | | | | | | | | | | | | | The change introduces regression in QIntValidator and QInputDialog, which needs to be addressed before pushing the change again. Also reverted the following two compile fixes: Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9. This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e. This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6. Reviewed-by: trustme
* Add operator< and qHash for QSharedPointer and fix operator-.Thiago Macieira2010-02-151-2/+47
| | | | | | This allows using QSharedPointer in QHash and QMap keys. Reviewed-by: Bradley T. Hughes
* Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)Thiago Macieira2010-02-141-32/+31
| | | | Reviewed-By: Trust Me
* Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)Thiago Macieira2010-02-132-3/+3
| | | | Reviewed-By: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-133-60/+158
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...
| * Optimized QLocale to access system locale on demand.Denis Dzyubenko2010-02-123-60/+158
| | | | | | | | | | | | | | | | | | | | | | | | 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). Reviewed-by: Thiago Macieira
* | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
|/ | | | Reviewed-by: mariusSO
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-101-1/+1
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup.
| * Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
| | | | | | | | | | When streaming a QPointF, it did not restore the inserting of spaces like the QPoint does.
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-092-38/+24
|\ \ | |/ |/| | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * add constOswald Buddenhagen2010-02-051-1/+1
| | | | | | | | Reviewed-by: hjk
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-043-7/+18
| |\
| * | Revert "Daylight savings time for Symbian take 2"Janne Koskinen2010-02-041-37/+23
| | | | | | | | | | | | This reverts commit 7bc18035816a2eac15dfac4d987eb9bf43f90ef6.
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-1/+1
| | | |
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-044-30/+55
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-031-23/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-292-4/+4
| | |\
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-2590-97/+111
| | |\ \
| | * | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-281-23/+37
| | | | | | | | | | | | | | | | | | | | Second try to make this work for all S60 platforms
| * | | | revert to fromUtf16() usage in fromWCharArray()Oswald Buddenhagen2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is a public function, so changing its semantics is no option. in fact, it broke qmake on windows (for symbian-abld and wince50smart). Reviewed-by: joerg
| * | | | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| * | | | document QString::fromUtf16() slownessOswald Buddenhagen2010-02-011-0/+11
| | | | |
| * | | | remove duplicated calculation of lengthOswald Buddenhagen2010-02-011-1/+1
| | | | |
| * | | | optimize qhash()Oswald Buddenhagen2010-02-011-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on any modern architecture, an 1 out of 16 times needlessly executed shift (even if a long one) and xor are less expensive than a pretty much randomly 1 out of 16 times differently taken conditional jump. so simply remove the conditional. ~15% faster on Core2. Reviewed-by: joao
* | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-012-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-271-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-7418
| * | | doc: Corrected misspelled word.Martin Smith2010-01-271-1/+1
| | |/ | |/| | | | | | | Task-number: QTBUG-7626
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0116-3/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | Optimise QStringList::join by pre-allocating the final size.Thiago Macieira2010-01-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a number of reallocations due to appending. This patch was contributed to us. Task-number: QTBUG-3242 Reviewed-by: Thiago Macieira
| * | | Merge branch '4.6'Thiago Macieira2010-01-211-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1390-95/+108
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-262-6/+6
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| | * | | | Revert "Daylight savings time for Symbian."Janne Koskinen2009-12-231-37/+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-223-5/+8
| | |\ \ \ \
| | * | | | | Daylight savings time for Symbian.Janne Koskinen2009-12-221-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-153-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | | | | | add {QString,QByteArray,QList,QLinkedList,QHash,QMap,QVector}::isSharedWith()Oswald Buddenhagen2009-12-1014-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these functions just compare the d pointers of two objects. this can be used to verify the validity of cached data: you keep a copy of the original data in your cache. consequently, any changes to the original data must detach, so this function reflects whether the cached data is still up-to-date. of course, this is not thread safe, as the data might change right after you check it, but that's a general problem of cache coherency which needs to be handled further up the stack. the functions are internal because the other detaching-related functions are internal as well for reasons beyond me. Reviewed-by: brad
| * | | | | | | fix (internal) apidocOswald Buddenhagen2009-12-101-1/+1
| | | | | | | |
| * | | | | | | Fix the int validator not handling the localeThierry Bastian2009-12-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3179 Reviewed-by: ogoffart
| * | | | | | | Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-041-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-031-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-021-2/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
* | \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0190-112/+131
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/deployment/deployment.qdoc doc/src/getting-started/installation.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/mainwindow.cpp examples/webkit/fancybrowser/main.cpp src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.ui tools/assistant/lib/qhelpsearchquerywidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/doc/assistant.qdocconf tools/assistant/tools/assistant/helpviewer.cpp tools/linguist/lupdate/main.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | | | | | | | | qUncompress: Fix terminating \0Markus Goetz2010-01-211-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 6666 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | | Fix crashes in QByteArrayOlivier Goffart2010-01-201-2/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QByteArray is was crashing on linux 64bit. The memory was freed twice, once by qRealloc, and one by QScopePointer::reset This patch will leak if qRealloc fails because of OutOfMemory. But we do not care as it is a corner case. Reviewed-by: Harald Fernengel Reviewed-by: Robert Griebl
| * | | | | | | doc: Corrected explanation of when append() does nothing.Martin Smith2010-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7246
| * | | | | | | doc: Added clarification about allocating space for the 0 terminator.Martin Smith2010-01-111-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5121
| * | | | | | | Update copyright year to 2010Jason McDonald2010-01-0690-90/+90
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-171-4/+4
| |\ \ \ \ \ \
generated by cgit v0.12 at 2025-02-12 03:48:54 (GMT)