| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\ |
|
| |\ \
| | | |
| | | |
| | | | |
into 4.6
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Otherwise, we get errors from one test to the next, due to the cleanup
unregistering the name again.
Task-number: QT-5588
|
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | |\ \ \
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Olivier Goffart
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Upgrade harfbuzz to b0d396aa88b3cdf8cea896bfeeba197656e1cdb1.
This fixes a text rendering problem in Malayalam.
Task-number: QTBUG-1887
Reviewed-by: Simon Hausmann
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Some network tests were set up to ignore a qWarning that was removed.
Fixed those tests.
Made warning from QIODevice::getChar have the right function name.
Reviewed-by: Thiago Macieira
|
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
Reviewed-by: Thierry <thierry.bastian@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Olivier
Task-number: QTBUG-6004
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5804
Reviewed-by: denis
|
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Setting a stylesheet or reparenting a widget into a
widget using style sheet would cause the usesScrollButtons
to be reset. Instead we now keep the flag whenever
it has been explicitly set by the user rather than
querying from the style again.
Task-number: QTBUG-3370
Reviewed-by: jbache
|
|\ \ \ \
| | | | |
| | | | |
| | | | | |
4.6-staging2
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Missing virtual function now implemented
Task-number: QTBUG-5977
Reviewed-by: axis
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: trustme
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-4334
Reviewed-by: ogoffart
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-1976
Reviewed-by: Gabi
|
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-5963
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Eskil
|
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | /
| | | |_|/
| | |/| | |
Conflicts:
configure.exe
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Chunk size increased to QIODEVICE_BUFFERSIZE (currently 16k) where
chunking is still needed. Namely, on sequential devices and when
QByteArray is unable to allocate a large enough buffer. This is
necessary for backward compatibility
Improved validation and prevention of overflow in maxSize argument.
Updated autotest that relied on a null QByteArray when no data was
available and no errors were found. The only guarantee we should be
providing in this case is an empty result -- even though that behavior
is preserved for the time being.
Affected functions:
* QIODevice::read(qint64 maxSize)
Chunking will still happen for large maxSize (i.e., QByteArray
resize fails), where it could be used as a synonym for
QIODevice::readAll().
No stat'ing performed. Read from device continues for as long as it
is successful. Stops if an error occurs or if we get less data than
requested.
* QIODevice::readAll()
Chunking is performed for sequential devices where total size
wouldn't be known beforehand. For sequential devices, reading
continues as long as data is returned, even if less than requested.
Non-sequential devices will be stat'ed once. If QIODevice::size
returns 0, this is taken to mean unknown size and chunking is
performed.
Otherwise, a single read request is made for the specified size. On
failure to resize QByteArray, nothing is returned.
* QIODevice::readLine(qint64 maxSize)
Chunking is performed for maxSize == 0, or if we can't allocate a
large enough buffer.
No stat'ing performed at this level. Read from device continues
until EOL is found, as long as we get all requested data.
Task-number: QT-2347
Reviewed-by: Thiago Macieira
Reviewed-by: Miikka Heikkinen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
... by catching failure to launch separate process earlier.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When writing nothing to a file, not actually writing anything is not an
error.
Also, from a change introduced in the same commit, there is no point in
checking for EOF when writing.
Task-number: QTBUG-5847
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \ |
|
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| |\ \ \ \ \ \ |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
X11/Windows: Launch gui application and stop them
via Windows manager, check stderr, exit codes, etc.
Currently tests Qt Designer, Qt Linguist, Qt Demo and
prominent examples/demos.
Rubber-stamped-by: Jason McDonald <jason.mcdonald@nokia.com>
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
tools/configure/configureapp.cpp
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Designer-formbuilder/uic incorrectly considered custom containers that
do not inherit a known page-based container (say QTabWidget) as
instances of QLayoutWidget, giving them a default margin of 0.
Add a check for the custom widget <container>-element to the checks
for QLayoutWidget in uic/formbuilder.
In the formbuilder, introduce a new data structure to store
custom widget information instead of using 3 separate hashes.
Adapt one autotest baseline (Qt 3).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5335
|
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | | |
4.6-staging2
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Increased the sample positions of the tabs a bit in order to
pass also un high DPI devices such as the XpressMusic 5800.
The former positions were too narrow under high DPI, and
overlapped by the text.
Reviewed-By: Liang Qi
|
|/ / / / / / / / |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Olivier
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The fix reverts some changes from 1f4e378ca0f9c63bb99a92f3e98b104a0baa408a.
Reviewed-by: Olivier
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The previous implementation was scrolling down (number of visible items
in viewport) + 1 and this was leading to one item being skipped while doing
page down (the same also happened for page up). Now we are scrolling (number
of visible items in viewport) - 1 for each page down(up) (the '-1' is for
keeping the context, so the last item will turn into the first in case of
a page down, for example).
Task-number: QTBUG-5877
Reviewed-by: thierry
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The autotest are included
Task-number: QTBUG-5884
Reviewed-by: ogoffart
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The execution flow would allow the widget the scene would be rendered on to be
null. However this very widget was being used when using DeviceCoordinateCache
to get the desktop size. We now skip this optimisation when no widget is
given. Auto-test included.
Reviewed-by: bnilsen
Task-number: QTBUG-5904
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Comparison between const and non-const iterator is not safe
Reviewed-by: Joao
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These two classes were missing exports. Since the accessors are inline,
the bug would only be visible when someone tried to call the
constructors of the classes.
Reviewed-by: Kent Hansen
|
|\ \ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | | |
|
| |\ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | | |
|