summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Improved documentation for new QTranslator::load() overloadDenis Dzyubenko2011-03-291-8/+9
| | | | Reviewed-by: trustme
* Changed the #ifdef block in QLocale to check for Q_OS_WIN instead of WS.Denis Dzyubenko2011-03-291-1/+1
| | | | Reviewed-by: Jeremy Katz
* Fixed checking for default arguments in QLocale::toCurrencyString()Denis Dzyubenko2011-03-291-3/+3
| | | | | | | We should check whether we got the default argument or the empty string that was provided by the user as toCurrencyString(123, QString("")) Reviewed-by: Zeno Albisser
* Use region name as a locale name on Mac.Denis Dzyubenko2011-03-291-31/+0
| | | | | | | | | | | | | This changes the behavior as before we were returning the name that we read from System Preferences -> Language which represents the language for UI translation. Now that we have QLocale::uiLanguages() we don't need a hack that returned UI language as a locale name. This essentially reverts adb6eea3a135707a220c0b1c1cf8266321af9309. Reviewed-by: con
* Updated CLDR data for QLocale.Denis Dzyubenko2011-03-291-370/+561
| | | | Reviewed-by: trustme
* Added native language and country names (endonyms) to QLocale.Denis Dzyubenko2011-03-294-1/+75
| | | | | | Task-number: QTBUG-17092 Reviewed-by: Zeno Albisser Reviewed-by: Liang Qi
* Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-288-6/+24
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-251-4/+11
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Skip failing tests QDir: Fix absolute paths when using file engines
| | * QDir: Fix absolute paths when using file enginesJoão Abecasis2011-03-181-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileSystemEntry doesn't know about paths as implemented by custom file engines, such as is the case with resource files. In such cases, we need to allow the engine to make the relative to absolute conversion. Expanded QDir's test case to ensure resource paths are considered in more places. Task-number: QTBUG-17921 Reviewed-by: Prasanth Ullattil
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-246-1/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code Update the data files for the QString benchmark test Fix a bug in the SSE2 UTF-8 decoder. Add ARM Neon versions of fromLatin1 and fromUtf8 Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE) Add baselines and zeros to the benchmarks. Add an UTF-8 conversion on trusted data and no BOM. Make it easier to write a UTF-8 conversion on trusted data Add the missing tests and 4-byte UTF-8 sequences Improve the code and avoid unnecessary stores Add an UTF-8 conversion optimised for ASCII using SSE2 Add an UTF-8 conversion code that is optimised for ASCII Add a stateless copy of the Qt 4.7 UTF-8 codec. Add UTF-8 code benchmarks Improve a little more the core loop and propagate to the other code Reduce the number of operations in the main loop Add an SSE4 version using PMOVZXBW and PSRLDQ Attempt to improve the epilog code ...
| | * | Fix warning about "data" being unused.Thiago Macieira2011-03-221-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
| | | |
| | * | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-2216-28/+64
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| | * | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | corelib/tools: Add two ### Qt 5 commentshjk2011-03-162-0/+6
| | | | | | | | | | | | | | | | A proposol to speed up qHash(QString) and QVector.
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def 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/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-221-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.4 Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call
| | | * | Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-211-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest.
| | | * | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously version resolved to unknown if Symbian or S60 version was queried and Series60v5.3.sis was found. Note that proper detection and enumerations for the new platform will come when they are agreed upon. Until then, this fix will make the new platform more usable. Task-number: QT-4593 Reviewed-by: Sami Merila
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-152-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits) Fix the license info for bin/elf2e32_qtwrapper.pl. Avoid panics in QDesktopWidget on Symbian emulator. QS60Style: use placeholder texture when polishing widgets and palette Regression: QS60Style: Theme background is incorrect Remove changes from fix to QTBUG-17045 that were not related to the fix Prevent null pointer crash when closing splitview QS60Style slows down layout switch by updating widgets unnecessarily Fix qgraphicstransform autotest for Symbian, where qreal is float. Removed reference to nonexistant profile. Disable capabilities example for symbian-gcce due to a bug in elf2e32 Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. Corrected a mismerge in GCCE link parameters. Fixed incorrect referral to an include file. Fixed win32-msvc2008 build regression. Made qmake strip trailing \ from libdirs. Fixed GCCE libdir handling if the paths have spaces in them. Added MinGW support for adding lib prefix and extension via profile. Added support for various special compiler/linker flags on MinGW. ...
| | | * | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-142-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig Conflicts: configure
| | | | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* | | | | | Changed the return value of QLocale::matchingLocales().Denis Dzyubenko2011-03-282-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of returning a QStringList, return the list of QLocale objects that can be used directly. Reviewed-by: axis
* | | | | | Fix the leak of QAdoptedThread and all dependent objectsOlivier Goffart2011-03-284-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if there is a QEventDispatcher in QAdoptedThread. QAdoptedThread is supposed to be destroyed when the QThreadData is destroyed. But QThreadData is ref-counted, and QEventDispatcher holds a reference to it. QEventDispatcher is supposed to be destroyed in QThreadPrivate::finish, which is supposed to be called from the destructor of QAdoptedThread. There is a circular dependence. We break it by calling finish in the callback that is called when the thread is finished. Task-number: QTBUG-17986 Reviewed-by: Brad
* | | | | | QtConcurrent: throw exception from destructorOlivier Goffart2011-03-281-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18149 Reviewed-by: Morten Sorvig
* | | | | | Use QByteArray::isEmpty instead of isNull in QLocaleDenis Dzyubenko2011-03-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking whether the environment variable is set or not, check for its length by using isEmpty as the envvar can be set to an empty string. Task-number: QTBUG-15321 Reviewed-by: Zeno Albisser
* | | | | | Fixed documentation for QLocaleDenis Dzyubenko2011-03-243-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | | Merge remote branch 'earth-team/master-i18n' into 4.8-earthDenis Dzyubenko2011-03-2414-8508/+10972
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/tools.pri
| * | | | | QLocale fixes.Denis Dzyubenko2011-03-245-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepended non-static functions with a qt_ prefix as our policy says. Reviewed-by: trustme
| * | | | | Revert "Added short time format support on Windows."Denis Dzyubenko2011-03-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96e3f2358ffdeb12c141e8139cdfbc8b24a14700. Conflicts: src/corelib/tools/qlocale_win.cpp
| * | | | | QLocale: Compile fix for windowsDenis Dzyubenko2011-03-221-44/+43
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | | Bugfixing QLocale::weekdays and updating manual testZeno Albisser2011-03-221-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | | | replaced weekendStart and weekendEnd with weekdays functionZeno Albisser2011-03-214-27/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17088
| * | | | | Merge branch 'master-i18n' of scm.dev.nokia.troll.no:qt/qt-earth-team into ↵Denis Dzyubenko2011-03-175-371/+441
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-i18n Conflicts: src/corelib/tools/qlocale.h
| | * | | | | Updated CLDR data for QLocale.Liang Qi2011-03-081-371/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary commit and meant to be removed before merging the branch into Qt as we don't want to bloat the repository size by updating CLDR every time we make a small change to QLocale, but do that only once when we are done. Reviewed-by: trustme
| | * | | | | Using list patterns to get a string from list in QLocale.Liang Qi2011-03-084-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17097
| * | | | | | Cache some values to improve digit substitution on Windows.Denis Dzyubenko2011-03-171-27/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | | | | | Narrow day name on WindowsDenis Dzyubenko2011-03-171-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added narrow day name support available on Windows Vista and newer. Reviewed-by: Zeno Albisser
| * | | | | | Refactored QLocale on Windows.Denis Dzyubenko2011-03-173-274/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LocaleChanged system locale enum that is queried whenever we detect that the system locale is changed. This should make it easier to have cached values in the system locale implementations. Reviewed-by: Zeno Albisser
| * | | | | | Use digit substitution on Windows for currency formatting.Denis Dzyubenko2011-03-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | | | | | Added digit substitution for date/time on Windows.Denis Dzyubenko2011-03-171-7/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we are asked to convert a date/time object to string, we should respect the system digit substitution rules. Reviewed-by: Zeno Albisser
| * | | | | | Added short time format support on Windows.Denis Dzyubenko2011-03-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Windows 7 there is a new TIME_NOSECONDS flag that is supposed to be used whenever short time format is requested. Reviewed-by: Zeno Albisser
| * | | | | | Merge remote branch 'earth-team/master' into master-i18nDenis Dzyubenko2011-03-1744-147/+311
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale.cpp
| * | | | | | | Improved QLocale::quoteString.Denis Dzyubenko2011-03-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the system locale doesn't return the proper alternate quotes we should try the standard quotes before falling back to the CLDR data. Reviewed-by: trustme
| * | | | | | | Extended documentation for QLocale.Denis Dzyubenko2011-03-041-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| * | | | | | | Added convenience script enum values to QLocale.Denis Dzyubenko2011-03-042-2/+28
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently SimplifiedHan and TraditionalHan are not widely used terms, hence adding convenience names SimplifiedChineseScript and TraditionalChineseScript. Also added the missing documentation for the Script enum. Reviewed-by: trustme
| * | | | | | Fixed spelling in the comment.Denis Dzyubenko2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | | | Fixed parsing on the locale name in QLocale.Denis Dzyubenko2011-03-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes QLocale autotests on Windows. Reviewed-by: trustme