| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The built-in eval() function bypasses the script registration
performed by QScriptEngine::evaluate(), so if we get an
atStatement() callback from JSC from that script, the
scriptID-to-sourceProvider lookup will fail.
In this case, just return from atStatement() without delivering
the positionChange() callback to the QScriptEngineAgent, since
the agent will not have received the scriptLoad() callback for
that script anyway.
This is a change in behavior from 4.5, but we consider it
the minimum-impact fix at this point to keep 4.6.0 from
crashing. The only downside is that debugging will
effectively be "disabled" for the script passed to eval(),
but that's a lot better than crashing.
Task-number: QTBUG-6108
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When processing the result of QIODevice::readLine, forgot to take into
account that a '\0' is appended to the array. The terminating character
is not accounted for in the number of bytes returned.
By pre-allocating a byte for the terminating null character, we make
sure we'll actually read 16k bytes on each and every iteration.
Task-number: QTBUG-6019
Reviewed-by: Thiago Macieira
(cherry picked from commit b7692016f282251002b3e85dfcb5567bd91a12c0)
|
|
|
|
|
|
| |
Reviewed-by: Olivier
Task-number: QTBUG-6004
(cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)
|
|
|
|
|
|
|
|
| |
Otherwise, we get errors from one test to the next, due to the cleanup
unregistering the name again.
Task-number: QT-5588
(cherry picked from commit 65e00180516eb136c2a7119dfe9e63fc9c66065e)
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit c7135e9b8d76e50daaa38d5d163687357878dc24)
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit b6070e9a069219e4049fcf017d6a160b80bf37b7)
|
|
|
|
|
|
|
|
|
|
| |
The problem was that the scene was not notified it lost the focus
when it was disconnected from the view (with setScene)
So when it got back the focus, nothing was updated because the
scene thought it still had the focus.
Reviewed-by: jasplin
(cherry picked from commit c535df0f286826c5575ec00c7e4c3f811a73918b)
|
|
|
|
|
|
|
| |
Task-number: QTBUG-5963
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Eskil
(cherry picked from commit a73e660fd05bafc402d63d71e811a621e46f452d)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 72ee915bb0465549b7ca8e62d2af146cc44fdeac)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 1e6b424b692b20dcfec920f8d3563e520ec1ff05)
|
|
|
|
|
|
|
|
|
|
|
| |
The test I wrote was not testing if calling undo/redo had any effect
on emitting undoCommandAdded(), added these test cases and fixed the
QTextDocumentPrivate::endEditBlock so we now again emit only when an
undo command is added, not also on calling undo or redo.
Reviewed-by: mae
Reviewed-by: Samuel Rødal
(cherry picked from commit 7e1f19c3e3036f166a84dbaa916ec1da1cc818c6)
|
|
|
|
|
|
|
|
|
| |
Correctly set the ItemAcceptsInputMethod flag in setTextInteractionFlags.
Reviewed-by: Andreas
Reviewed-by: axis
Reviewed-by: Janne Koskinen
(cherry picked from commit ead0ab9e14603f278fcaaf4f126cdd232274fe26)
|
|
|
|
|
|
|
|
|
|
| |
When enabling/disabling a widget or changing its InputMethodEnabled attribute,
use the focus proxy widget's input context for reset and for setting the focus
widget on the input context.
Task-number: QTBUG-5781
Reviewed-by: Denis
(cherry picked from commit 851814cfedd678bfdf019eeafecd085b9df9058f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
browser use it.
- Handle windows files names by looking for paths first (and don't check
that it exists first)
- Handle host names without dots (it was not handled because of
difficulties with the case host:port)
- Return the parsed url only if the host or the path is not empty
instead of returning a url that looks like "http:"
Reviewed-by: Thiago Macieira
(cherry picked from commit aeea26b384a362e59c335f7932a8b3915c1c8383)
|
|
|
|
|
|
| |
Task-number: QTBUG-4480
Reviewed-by: Thierry
(cherry picked from commit dc2cb80ceb35edd958685189e9075ac1061870f4)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE settings also
apply to 8-bit grayscale, so we need to check the bit depth of the image
as well. For convenience we also try to write the images using
PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE as opposed to
PHOTOMETRIC_PALETTE when we detect that the color table is grayscale.
Task-number: QTBUG-5459
Reviewed-by: Benjamin Poulain
(cherry picked from commit 845c69b2e780e1646f68ee99beda10768a1971e2)
|
|
|
|
|
|
|
| |
Add LGPL-ONLY to the supported tag types.
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
(cherry picked from commit 3a92f40e1faf4d81f5071a66558b051a9fda727e)
|
|
|
|
|
| |
If this autotest doesn't pass, FBOs are really broken.
(cherry picked from commit 3143014a80d1dfdfe3bb0f6175a3f7f7f41b2aaf)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QWS combines the window title bar and the top-level widget
into one window surface, which causes problems when the top-level
widget is a QGLWidget: the raw GL surface contents are not the
same as on other platforms where only the top-level widget
contents are included in the window surface.
This change sets Qt::FramelessWindowHint on QWS systems on
widgets where we need to read back the top-level widget for
comparison against a reference image.
Reviewed-by: Sarah Smith
(cherry picked from commit b48ae5932131b6d0934a50846cad441f6e9f5ccd)
|
|
|
|
|
|
|
|
|
|
| |
There were problems with false-failures due to the test farm's GL
implementation having off-by-one pixel errors. To fix this, we don't
compare every pixel but rather sample pixels in a grid pattern which
avoids boundries.
Reviewed-By: Samuel
(cherry picked from commit 18a3daf86118bd23a28f05fcf1721969c4ba491b)
|
|
|
|
|
|
|
|
|
|
| |
Introduce a fuzzy pixel and image compare which changes it's allowed
fuzz based on the system's color depth. If the compared images are
different, the autotests will also save the two images to the current
directory for comparison.
Reviewed-By: Samuel
(cherry picked from commit c92670dc8b2e5cf727c33943dde0755c17d0dac2)
|
|
|
|
|
|
|
|
| |
If we succeed in creating a shared context, then mark the original
as shared as well.
Reviewed-by: Sarah Smith
(cherry picked from commit 09a123c7f9df37f82a4baab0e7ec70ebfe5444d3)
|
|
|
|
|
| |
Reviewed-by: Samuel
(cherry picked from commit e2e8104c03608ef753f84740bdf6ac1bff18be84)
|
|
|
|
|
| |
Reviewed-by: Sarah Smith
(cherry picked from commit 829265b98a6c7c3856f3504e29209bff38c95ce9)
|
|
|
|
|
|
|
|
|
|
| |
If this is not done, the climbing ancestors later in the method uses
srcParent.row() as pos causing failure depending on which rows are being
moved, and what the row of the parent is.
Merge-request: 2072
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
(cherry picked from commit e6be9c88bc98481936fcba7fa1cfb4e255f6e30b)
|
|
|
|
|
|
|
|
|
|
|
| |
The documentation for QGLContext::isSharing() indicates that
the function returns true only when the context is sharing.
However, previously the sharing flag would stay on if the
context was created as sharing but is no longer sharing.
Task-number: QTBUG-5578
Reviewed-by: Sarah Smith
(cherry picked from commit 0e74cc3e1a05147a8ae9c1c4be7c9f836da1acf3)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 4bf7f90a27377f439e86d6175e5e3cdebd131be0.
The change is already reverted in kinetic-declarativeui.
Reviewed-by: Warwick Allison
Reviewed-by: bnilsen
(cherry picked from commit 5e3f81237aae96181c9315b8e7c6c5368629a000)
|
|
|
|
|
|
| |
Task-number: QTBUG-5663
Reviewed-by: ogoffart
(cherry picked from commit 2321e8636d7436b70a8afcde16828f00c4b8590e)
|
|
|
|
|
|
|
|
|
|
| |
After 31f1ff910, posted events could be delayed by a previous call to
processEvents(). This causes some tests to randomly fail, so bring back
the invariant that processEvents() will always call sendPostedEvents() when
called "manually" (i.e. not from exec()).
Reviewed-by: Prasanth Ullattil
(cherry picked from commit fe0f807e1f4e7510c6d8cddd848bcbc25e358651)
|
|
|
|
|
|
|
| |
Changed the signature of QT_OPEN to be the same on all platforms.
Reviewed-by: thartman
(cherry picked from commit c9aa65bf79fdd09ad5d6405ba1d127888e26fd26)
|
|
|
|
|
|
|
|
|
| |
QCustomScopedPointer was moved to a private header since it's only a
helper class. QScopedSharedPointer wasn't necessary since it can be
replaced with QSharedDataPointer neatly.
Reviewed-by: Jesper Thomschütz
(cherry picked from commit 95db13345cd7b6b7cac8725fe2879aaf80233818)
|
|
|
|
| |
(cherry picked from commit 1a36403e3c21a60f81cd0244b84f21223b4216e9)
|
|
|
|
| |
Reviewed-by: TrustMe
|
|\
| |
| |
| |
| | |
Conflicts:
src/corelib/tools/qscopedpointer.h
|
| |
| |
| |
| |
| |
| | |
this makes sense if one uses lupdate only for validation purposes, i.e.
to find out if the code uses only ids which are defined in some external
specification.
|
| |
| |
| |
| |
| | |
when comparing two messages which both have ids, compare only the ids.
this affects finding/reporting duplicates and merging.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... to also test QScopedArrayPointer, QCustomScopedPointer and
QScopedSharedPointer.
Added one level of indirection to comparison test case to avoid
double-delete in case of test failure. The test also tests other aspects
of Q*Scoped*Pointer behavior.
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|\ \ |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
instead than when parsing the cookie header.
This corrects the bug QT-2379, happening in the following sequence:
parseCookie -> setCookieUrl -> toRawForm -> parseCookie
where a default domain would now also have a dot prefix, and shouldn't.
QT-2379
Reviewed-by: Peter Hartmann
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QLCDNumber doesn't follow the API convention of *Count and set*Count().
Introduce properly named functions, and obsolete the old ones.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
|