| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: Jeremy Katz
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
| |
Task-number: QTBUG-17092
Reviewed-by: Zeno Albisser
Reviewed-by: Liang Qi
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Skip failing tests
QDir: Fix absolute paths when using file engines
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
...
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/gui/image/qpnghandler.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
A proposol to speed up qHash(QString) and QVector.
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
...
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
RevBy: axis
RevBy: Morten Johan Sørvig
Conflicts:
configure
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Instead of returning a QStringList, return the list of QLocale objects
that can be used directly.
Reviewed-by: axis
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-18149
Reviewed-by: Morten Sorvig
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: trustme
|
|\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
Conflicts:
src/corelib/tools/tools.pri
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Prepended non-static functions with a qt_ prefix as our policy says.
Reviewed-by: trustme
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 96e3f2358ffdeb12c141e8139cdfbc8b24a14700.
Conflicts:
src/corelib/tools/qlocale_win.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: trustme
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Denis Dzyubenko
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17088
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-i18n
Conflicts:
src/corelib/tools/qlocale.h
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Denis Dzyubenko
Task-number: QTBUG-17097
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added narrow day name support available on Windows Vista and newer.
Reviewed-by: Zeno Albisser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Whenever we are asked to convert a date/time object to string, we should
respect the system digit substitution rules.
Reviewed-by: Zeno Albisser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/corelib/tools/qlocale.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: axis
|
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: trustme
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixes QLocale autotests on Windows.
Reviewed-by: trustme
|