summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Specify maximum array size for QByteArray.Leonard Lee2013-08-211-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-33037 Change-Id: I3f39b1498fc70614402fca2281ffbd1a6ec4cf3f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Improve QBitArray's construction performance a littleThiago Macieira2013-08-311-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Ask for an uninitialized byte array, since we're about to memset(3) it anyway. And don't overwrite the initial byte either. Change-Id: I2caa2ef395ad5684416e6cd336c0444de7787b5d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | Add a construction note on why QBitArray has a +1 everywhereThiago Macieira2013-08-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | It took me several minutes reading the code to figure out why it was there. It wasn't immediately obvious. Change-Id: Ic36b3fd24ce84a1b08c73986d3b7ab8a5bfff133 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Fix corner-case counting of bits in QBitArray::count(bool)Thiago Macieira2013-08-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This actually looks very wrong. First, it would try to read bits for len == 0, which means it was actually reading the implicit NUL from QByteArray (so valgrind would never catch the error). Second, there was a corner case for testing the 8th bit (bit 7) in the last byte. For len == 8 or 16 at the beginning of the last loop, it would read bits[len / 8], which is again the implicit NUL from QByteArray. Compare to testBit (simplified): return d.constData()[1+(i>>3)] & (1 << (i & 7)) != 0; Task-number: QTBUG-11625 Change-Id: Idb361163de596b629cab42f2367ddd09456c2a98 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | | Remove workarounds to old GCC bugs we had encountered on IRIXThiago Macieira2013-08-311-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check is bogus anyway. It was bogus when it was added. The bug is not because of "GCC on IRIX", it's simply a GCC bug and was probably tied to some GCC versions. It should have been reported and followed up. I don't even remember what GCC versions we had on the IRIX machines (plastkrakk, I can't remember the other two machine names). But I could bet they were GCC 3.4 or 4.0. Change-Id: I84ce4e1ad68bb0520b63c210f841e0c604dbd03a Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Doc: Enable documentation for QScopedPointer's rvalue ref functionsTopi Reinio2013-08-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documented QScopedPointer functions that take rvalue references visible in the documentation. Task-number: QTBUG-32675 Change-Id: If65af91d9379a6c0486e43c33434cca8505fc5c3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | QDateTime - Extend fromMSecsSinceEpoch APIJohn Layt2013-08-292-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add convenience methods for fromMSecsSinceEpoch() and fromTime_t() to enable direct creation of other time specs than LocalTime without the overhead of unncessary conversions. For example instead of: QDateTime dt = fromMSecsSinceEpoch(12345).toUtc(); the following saves two conversions: QDateTime dt = fromMSecsSinceEpoch(12345, Qt:UTC); This will improve the performance of the new QTimeZone class. [ChangeLog][QtCore][QDateTime] Added convenience methods for fromMSecsSinceEpoch() and fromTime_t() to take time spec to be used in returned datetime. Change-Id: I133635bfe3d35ee496a287257e13b2d600225a38 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | | QDateTime - Improve and expose Qt::OffsetFromUtcJohn Layt2013-08-283-148/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt::OffsetFromUtc TimeSpec was made public in Qt 4.4 but the access methods were never made public in the apidox effectively meaning the feature was never used. The implementation was also incomplete and inconsistent. This change cleans up the implementation and exports new public API for using the TimeSpec using new method names consistent with the new QTimeZone support. This change increases the QDataStream Version number for Qt 5.2 to 15. The behavior of one constructor has changed slightly to be consistent with the rest of the feature, but this behavior was never documented. [ChangeLog][QtCore][QDateTime] Fully implement support for Qt::TimeSpec of Qt::OffsetFromUTC, added new methods for offsetFromUTC(), toTimeSpec(), and toOffsetFromUTC(). Task-number: QTBUG-26161 Task-number: QTBUG-29666 Change-Id: If3cc7fc9778ca2b831644408ae749448d5975a3a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | | Don't compare const_iterator with iterator.Stephen Kelly2013-08-271-2/+2
|/ / | | | | | | | | | | | | | | | | Commit 93ffb81df6e2cdc57ac8f70c6578f132024d7117 introduced this bug. As it is in the header, it affects downstreams. Change-Id: I02e86927e648153ca7c0b66ac945a7f99cc4cd89 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Don't try to detect the CPUID instruction if we're compiling for PentiumThiago Macieira2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're compiling for Pentium or better CPUs, then we know that the CPUID instruction is present (I think it was introduced in late 486s, actually). So don't try to detect it. Simply assume it's there and then execute it. This means that if you compile Qt for Pentium (or higher) and run it on an i386 or i486, you'll get a SIGILL (or whatever your OS produces for an #UD processor exception). If the CPU detection code even got run -- SIGILL might happen for any other instructions found along the way. Change-Id: Iacd4a94a51363a609a61fc2bfd2e218fb290272d Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Long live QCommandLineParser!David Faure2013-08-245-0/+1406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QCommandLineParser class provides a means for handling the command line options. QCoreApplication provides the command-line arguments as a simple list of strings. QCommandLineParser provides the ability to define a set of options, parse the command-line arguments, and store which options have actually been used, as well as option values. Done-with: Laszlo Papp <lpapp@kde.org> Change-Id: Ic7bebc10b3f8d8dd06ad0f4bb897c51d566e3b7c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QLinkedList - fix insert with iterator when the list is shared.Thorbjørn Martsum2013-08-241-0/+3
| | | | | | | | | | | | | | | | Before a call to erase on a shared instance would imply that the item was inserted into the shared data (i.e all instances) Change-Id: I655ccf04b1ad9bf82e6bfade58929538fa7df000 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QList - fix insert with iterator on shared instanceThorbjørn Martsum2013-08-241-1/+5
| | | | | | | | | | | | | | | | This patch ensures correct detach when insert with an iterator is called on a shared instance (i.e same behavior as QVector) Change-Id: Id660eacd3cc7b633456dfa989997bbad747e1df2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QLinkedList - fix erase with iterator when the list is shared.Thorbjørn Martsum2013-08-241-2/+32
| | | | | | | | | | | | | | | | | | | | | | Before a call to erase on a shared instance would imply that the item was removed from the shared data (i.e all instances) This patch improves the behavior to detach and erase the item specified by the iterator (i.e same behavior as QVector) Change-Id: Ib3cfb5363c86b400886c80b75b0c20ca854ce801 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QList - fix QList::erase when the list is sharedThorbjørn Martsum2013-08-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Before calls to erase on a shared instance would in release mode imply that items were removed from the shared data (i.e all instances). In debug mode it would assert. This patch improves the behavior to detach and erase items specified by the iterator(s) (i.e same behavior as QVector) Change-Id: I89b69446cb1ffd43a98402b7ab1ec9a59bceb8e6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QMap - fix erase with iterator when the map is sharedThorbjørn Martsum2013-08-241-0/+21
| | | | | | | | | | | | | | | | | | | | | | Before a call to erase on a shared instance would imply that the item was removed from the shared data (i.e all instances) This patch improves the behavior to detach and erase the item specified by the iterator (i.e same behavior as QVector) Change-Id: Ia44db84fc1388d92308bf0d2b32539ac4d53850b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QHash/QSet - fix QHash::erase when the hash is sharedThorbjørn Martsum2013-08-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Before a call to erase on a shared instance would imply that the item was removed from the shared data (i.e all instances) This patch improves the behavior to detach and erase the item specified by the iterator (i.e same behavior as QVector) Since QSet uses QHash it improves QSet the same way. Change-Id: I850b1efcf7bdfc85ceddb23128b048af95f75063 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Thiago Macieira2013-08-222-2/+10
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-212-2/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| | * Ensure that bootstrapped users of QCryptographicHash only use SHA-1Thiago Macieira2013-08-152-1/+9
| | | | | | | | | | | | | | | | | | | | | This reduces code size quite considerably in the bootstrapped tools. Change-Id: I7475650b1936e93afcf327cb4def2f7763609179 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Don't compile MD4, MD5, SHA-2 and SHA-3 into qmakeThiago Macieira2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We just need one digest algorithm, any algorithm, to generate a somewhat unique identifier. SHA-1 will suffice. Change-Id: I3cb26bf866d616df3ef32feace10934f19daa1a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | QHash: fix compilation with gcc-4.2.1 (Mac OS X)David Faure2013-08-211-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The anonymous union isn't supported and can be replaced with a reinterpret_cast. Change-Id: Ic76a31f36e61d910db16312d7a6c4bdc728aa825 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | QDateTime - Use the copy constructor in addDays/Months/YearsJohn Layt2013-08-211-3/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | Currently the QDateTime::addDays/Months/Years methods copy all the d member variables themselves, but this is bad practice as it means 3 more places where we have to get the copy code correct. Instead use the copy constructor to do what it's meant to. This saves more changes when we add proper OffsetFromUTC and TimeZone support. Change-Id: Ie2641d0cb58405335206edcce2e2db30702b78bf Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-166-21/+16
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-146-21/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| | * un-confuse lupdate: make #ifdef'd braces symmetricalOswald Buddenhagen2013-08-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | as a side effect, this also de-duplicates the code, which is good in its own right. Change-Id: I504cb518276fdf610639c3337e3842570b97815f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: John Layt <jlayt@kde.org>
| | * QByteArray: Remove some reinterpret_cast<>.Friedemann Kleint2013-07-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: QByteArray(QByteArrayDataPtr dd) constructor warning C4946: reinterpret_cast used between related classes: 'QArrayData' and 'QTypedArrayData<T>'. Task-number: QTBUG-32559 Change-Id: I06356902f79ed6bf784127ff0c3a97d3263a25da Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * Remove a left over cast that is now semantically incorrect.Jake Petroules2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | CFPropertyListRef is a typedef for void*, which is why this code was compiling OK prior to this change. Change-Id: I78d65652a76721434056bd9f6d011917e2864125 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Work around msvc /clr LNK2005 errors with QListRichard Browne2013-07-301-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a compatibility with Qt 5 and Microsoft C++ /clr mode. The QList copy constructor defines a Cleanup class that causes LNK2005 errors. It is a compiler problem, but the patch is simple. The use of QT_TRY/QT_RETHROW instead of a Cleanup class is more consistent with other Qt code, so is arguably preferable even without the compiler bug. Task-number: QTBUG-31949 Change-Id: I1acfbae1924f0a52ffb8d9722b52e01b61edd42e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Correct QHash::values() documentation.Mitch Curtis2013-07-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia19bd0578591f77e5aee1c7e3e619ba97754f384 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | QVector - optimize removeLast (and takeLast + pop_back)Thorbjørn Martsum2013-08-161-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our benchmarks this makes removeLast more than twice as fast. (That is on my core I7 laptop with gcc on linux). It changes the alloc test to be an assert rather than an if. Change-Id: Id55195b9b7880e54a89be4dd9d6228d94aff23c7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | initCharAttributes() micro-optimizationKonstantin Ritt2013-08-151-5/+12
| | | | | | | | | | | | | | | Change-Id: Id8e275c9b4ae0a9855b8ba8917824c79cde5a919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QLocale: Minor code dde-uplicationKonstantin Ritt2013-08-141-8/+6
| | | | | | | | | | | | | | | Change-Id: Ie48111a8f76798eb706d6a4036c7965d32ed542b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | [2/2] Implement Unicode Normalization Form Quick Check (NF QC)Konstantin Ritt2013-08-144-6447/+6733
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Use QuickCheck data from DerivedNormalizationProps.txt to check if the input text is already in the desired Normalization Form. \sa http://www.unicode.org/reports/tr15/#Detecting_Normalization_Forms Using NF QC makes a significant boost to most operations that rely on normalized input data, i.e. file path conversions on Mac, where "native" form is a decomposed Unicode string. Change-Id: I292a9da479c6beed730528fc7000c45bf1befc34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Update QLocale locale database up to CLDR 23.1Konstantin Ritt2013-08-123-1259/+1268
| | | | | | | | | | | | | | This only added Kosovo [XK] territory and few valid locales for it. Change-Id: Ia0b47041ed5cd1303b5bc233f2502a3725c74da9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | add QScopedPointerDeleteLater, a custom deleter for QObjectsMatt Broadstone2013-08-122-0/+14
| | | | | | | | | | | | | | | | | | | | This is a custom deleter for QObjects that are participating in an event loop (e.g. waiting for signals to complete a task), which need to be deleted using deleteLater() rather than just delete. Change-Id: I3084ea28a6829a299c7400006c617fc23cf15160 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add a few more typedefs to QString, for STL compatibilityThiago Macieira2013-07-302-3/+33
| | | | | | | | | | | | | | Task-number: QTBUG-22890 Change-Id: I457be6367e577dee30532383d10c519b2f2617b3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Avoided zero devision in cube root approximationBernd Weimer2013-07-291-4/+6
| | | | | | | | | | | | | | | | Halley's method to get a better approximation is omitted, if it would include a devision by zero (INFINITY/NaN is worse). Change-Id: Ida09326e2b5892d7cb21bcb956631c289e5b56ba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Implement move-ctor and move-assignment-op for QScopedPointerGiuseppe D'Angelo2013-07-282-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes sense for a QScopedPointer to be movable, for instance for allowing instances to be returned from a function. Ownwership of the managed pointer is still tied to one (and one only) QScopedPointer instance. Moreover, a move assignment operator makes sense as well, as it implementing the equivalent of this->reset(other.take()); only when other is a rvalue and not a lvalue (so either it's a temporary or it's getting explicitly moved in with std::move). This makes QScopedPointer API's a bit closer to std::unique_ptr's one. Task-number: QTBUG-29754 Change-Id: If1ac0c688327a67af4ad5b7ad45b439b022ed1c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add the RFC2822Date formatKevin Ottens2013-07-241-0/+135
| | | | | | | | | | | | | | | | | | | | | | QDateTime can now be converted to strings compliant to RFC 2822. Additionally, it supports RFC 850 and RFC 1036 during parsing. By having them all together, all type of dates found in exchanged messages on the internet (including USENET) get supported. Change-Id: I771066c23f409d20b31b7d802f37852ea68ca2a0 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Add reminders to change uint to quint64 in Qt6 QDateTime time_t methodsDavid Gil2013-07-151-0/+3
| | | | | | | | | | | | | | | | | | In order to avoid problems in 2038 with time_t dates in 32-bit machines, add reminders to change uint to quint64 in Qt6, in time_t-related methods of QDateTime. Change-Id: I1596a64fe1806df17c28c7586bb1ce6283b9ae02 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QVarLengthArray - check if iterators arguments are valid (in debugmode)Thorbjørn Martsum2013-07-121-0/+10
| | | | | | | | | | | | | | This add checks on iterators on insert and erase. Change-Id: I41d96e038d74668cc1df10b6d42cde4b82f8a696 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QSet - check if iterator argument is valid (in debugmode)Thorbjørn Martsum2013-07-122-1/+9
| | | | | | | | | | | | | | This adds a check on erase that the iterator is from the set. Change-Id: I9f4e127d53a5b1f5f8c70652604f1f5574c73688 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QHash - checks if iterator argument is valid (in debugmode)Thorbjørn Martsum2013-07-121-0/+20
| | | | | | | | | | | | | | This checks if the iterator argument in erase is valid in debug mode. Change-Id: I8768f4263d1464ff78986a1a30702e210e561dc1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QList - check if iterators arguments are valid (in debugmode)Thorbjørn Martsum2013-07-121-2/+15
| | | | | | | | | | | | | | This adds a check of the iterator values in erase and insert. Change-Id: I78403dcbd24fd7c6beb86d3c827a8e233963e770 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QVector - check if iterators arguments are valid (in debugmode)Thorbjørn Martsum2013-07-121-1/+9
| | | | | | | | | | | | | | This adds a check of the iterator values in erase and insert. Change-Id: I28e660153dbfc5f0054a5b25cba2c5725c678a81 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QMap - check if iterator arguments are valid (in debugmode)Thorbjørn Martsum2013-07-121-0/+18
| | | | | | | | | | | | | | | | | | This patch adds a debug-tests in erase, insert (with hint) and insertMulti (with hint) that ensures the iterator-argument is valid (and e.g not from another map) Change-Id: I7920131bc9712543183cabf13c7603bd0e12880d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-111-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * Fix change-of-sign warning found by ICCThiago Macieira2013-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | qstring.cpp(3896): error #68: integer conversion resulted in a change of sign The line before also had 0x8000, but since there was no addition, 0x8000 was a literal converted to short. However, 0xff + 0x8000 is an int, and 0x80ff is positive, while short(0x80ff) is negative. Change-Id: I445ff401d817b643479e54320525890ce12bbfe5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Implement system locale for AndroidEskil Abrahamsen Blomfeldt2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | On Android, we would default to C locale always. We need a connection to Java in order to get the locale, so this has to be done in the platform plugin rather than the QtCore library. It's enough to instantiate the QSystemLocale subclass, since this will automatically register itself as the current system locale. Task-number: QTBUG-31651 Change-Id: I76f3e30f7dff90e8101cb560cee2b96c9300d9af Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>