| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This is supported by the others operator+
Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363
Reviewed-on: http://codereview.qt.nokia.com/764
Reviewed-by: hjk
(cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The behaviour is different with or without QT_FAST_OPERATOR_PLUS
And since on old gcc it is not defined, then the test fails.
With the normal operator+, the bytearray will first be converted to
a QString, and loose everything that is after \0, but now, with
QStringBuilder, we do not do QString conversion anymore, so no data
is lost.
We do not want to specify the behaviour here, so we remove the test.
Reviewed-by: Joao
|
|
|
|
|
|
|
|
|
|
|
|
| |
Optimize cases when we have.
string += someString + someOtherString
Avoid the allocation of one temporary string.
Behaviour change:
byteArray += someString + QByteArray("foo\0bar", 7)
before, the array would end at foo because of the conversion to string
Reviewed-by: hjk
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
stringbuilder.cpp(160) : error C2666: 'operator +' : 2 overloads have similar conversions
stringbuilder.h(416): could be 'QStringBuilder<A,B> operator +<QByteArray,char[5]>(const A &,const B (&))'
with
[
A=QByteArray,
B=char [5]
]
or 'built-in C++ operator+(__int64, char [5])'
while trying to match the argument list '(QByteArray, char [5])'
The reason is the cast to QNoImplicitBoolCast (which is int)
|
|
|
|
|
|
|
|
|
| |
This breaks source compatibility if one made its own QConcatenable
as it nows require a Prefered type.
And also sometimes if QT_USE_FAST_OPERATOR_PLUS was used, and
the result of an addition between two QByteArray is used directly
Reviewed-by: Denis
|
|
|
|
|
|
|
|
|
| |
Instead of relying on the old behavior of the deprecated QString(QByteArray)
constructor which stops copying the byte array at the null termination
character if there is one embedded in the array, we copy the whole provided
QByteArray object into the QString when QStringBuilder is used.
Reviewed-by: Harald Fernengel
|
|
|
|
|
|
| |
when QT_NO_CAST_FROM_ASCII is not defined, the string is assigned
to an string with more than ascii.
So if the codecForLocale is not latin1, it would fail.
|
|
|
|
|
|
|
|
|
|
| |
QString() is a no-op if string is already a QString
And it fixes the compilation if other types are use that do not have
toLocal8Bit such as QStringBuilder.
WebKit trunk has an instance of such usage.
Reviewed-by: Joao
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
On GCC 4.0 we disabled the possibility to use the fast operator plus as
a bug in the compiler makes it impossible to add enums.
There is no normal operator+ for these case. Always test the operator% instead.
Reviewed-by: joao
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Now, it's a real drop-in replacement, with no known feature regressions
:)
Reviewed-By: hjk
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
Some S60 and WinCE test scripts prefer to have only one executable per
directory.
|