| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This change is not required by Qt5.
Change-Id: I8b6ea3fcd1c879ee7e74bb304ef27d090d53e6e5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
completer_data() was attempting to find the first folder which did
not begin with a '.' character under QDir::root() for usage during the
test.
However, a typo caused it to find the first folder even if it _did_
begin with a '.'; unless the first folder returned by entryList()
was ".", in which case no folder would be found.
(cherry picked from qtbase commit 0776746d47c9b0d575b6190b1882c571a76ee086)
Change-Id: I1d98afa071ea4300e4e2f0aa324e8c1fd8a0728e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needed for the BB10 Cascades profiling. There are more reasons for
introducing this patch:
1) Cascades do not use QtGui library for QML rendering. It has its own
paint engine with client-server architecture. Profiler traces are sent
asynchronously from non Qt renderer thread to the Qt client.
The QPerformanceTimer has to be patched too, cause we need to know time
difference between tracing zero time and some time in past,
see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const
2) Since we need more sophisticated trace engine in cascades, this patch
allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace
to the trace framework.
If no custom instance is assigned, the default QDeclarativeDebugTrace
instance is created implicitly on first trace request.
Using custom trace instance which is not part of Qt
(it is part of libbbcascades) allows us to implement all Cascades trace
special needs in libbbcascades and not to carry Qt with the platform
specific code.
3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to
allow custom trace engine only on the bleckberry platform,
see declarative.pro.
If this macro is defined Qt compiles from its original code.
4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable
for other projects which needs to extends somehow default Qt trace
functionality.
5) Patch is not intended to be applied to Qt Quick 2, since declarative
debugging infrastructure is changed there.
(cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370)
Change-Id: I199211c1de66e930e252e8c033503d7f4940565f
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
| |
This is a backport of
qtdeclarative commit 581c57125368eb6ef0b853e037649cf0c1a8bc80
Change-Id: Iab31f106b83958a62d9fcbb53fc1daf6931d3257
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The receiver count needs to be correct in connectNotify() to be
compatible with ordinary connections.
Fix this and add test.
This is a backport of qtdeclarative commit
b1c6e095404ccb7788e6b12fff692c71f4900815
Change-Id: Ic3145a536c928eccfcc29b4d010a526135b654b0
Reviewed-by: Alan Alpert <416365416c@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test historically relied on obscure environment variables
to determine whether the examples, demos should be run.
Remove that code and check whether the executables exist.
In the Window manager code, no longer exclude WS_POPUP windows,
which seems to fail with the current Qt 4.8.
Task-number: QTQAINFRA-428
Change-Id: I88d2be085cb543effc800115885e8ff86a1cf7ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SQL Server 10 introduced stricter rules for TIMESTAMP validation,
making it necessary to specify the decimal digits.
Other databases might do the same as well, so this patch introduces
a check for the TIMESTAMP column size and adjusts the decimal digits
parameter as needed.
Task-number: QTBUG-2192
Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
|
|
|
|
|
|
|
|
|
|
| |
Replace qWait() by qWaitForWindowShown().
Add QEXPECT_FAIL on Mac for tst_QFocusEvent::checkReason_Popup
and tst_QFocusEvent::checkReason_ActiveWindow.
Task-number: QTQAINFRA-428
Change-Id: If172085850ac1bd7cf6187b0e767b60fe46be934
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The tests are now run from the 'debug',
'release' subdirectories on Windows by 'make check'.
Go up one directory so that the relative paths are correct.
Network tests only.
Task-number: QTQAINFRA-428
Change-Id: I03bc04028b405bc4f897cbf9d7cb400cc009bb8f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The state of native menus is currently updated in two incompatible ways
on Mac, either by updating the state of native menu items in a native
menu (when setEnabled is called) or the state of the native menu
item containing the native menu (when the menus are initialized and
when a modal dialog is opened/closed). This causes various problems,
e.g. inability to enable a menu that was disabled before menu
initialization or menus getting enabled incorrectly after a modal
dialog is closed. Fix by always setting the state of the native menu
item that contains the native menu.
Also, autoenable is active for the main menu, resulting in unnecessary
menu validation calls, so turn it off.
Task-number: QTBUG-25544
Task-number: QTBUG-26399
Task-number: QTBUG-7538
Change-Id: Iab335af633604e7b3017eaa55464d1b8fdd7b821
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The tests are now run from the 'debug',
'release' subdirectories on Windows by 'make check'.
Go up one directory so that the relative paths are correct.
Non-network tests.
Change-Id: I8d0f806ff6708c3111a39c861ed46b21881acc7b
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt 5 fix (aec5b76) doesn't apply here, because it introduces
a new symbol that might break forward compatibility if code
compiled against a newer Qt 4.8 is run against an older Qt 4.8,
and QScrollBar::wheelEvent() ends up being devirtualised.
So copy the guard clause from QWidget::event() here.
Task-number: QTBUG-27308
Reported-by: chenjiexin
Task-number: QTBUG-21534
Reported-by: Martin Koller
Change-Id: I5d2f823c65bae8cff33bac320c37e6496b14646c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As it turns out, the convention of (dis)connectNotify() is to include
the signal prefix, i.e. '2'.
Therefore add this prefix also when calling these functions from QML.
Also add a unit test confirming that the C++ and QML cases are now
handled the same way.
This patch is not needed in Qt5, as connectNotify() and
disconnectNotify() take a QMetaMethod as a parameter, not a
const char*.
Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191
to fix a crash on exit.
Task-number: QTBUG-20377
Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
"HTTP/1.1 100 CONTINUE\r\n"
If the header from a server is splitted between two packets
the first packet contains "HTTP/1.1 100" and the second one
contains " CONTINUE\r\n", one space (0x20) is skipped. After
processing the line looks in this way "HTTP/1.1 100CONTINUE".
QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket)
is called twice, if a http header is splitted as above.
The function always removes whitespace from the beginning of a packet,
even if it is the second part of a http header
QHttpNetworkReply returns QNetworkReply::RemoteHostClosedError
due to damaged http header during processing.
Task-number: QTBUG-27161
Backported qtbase/60f4fc8b706db9cbeacd5dc4886a7aa347daafc0
Change-Id: I07ec43641bbb9966285a8a1f57a51fb27d2643d4
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A horizontal line should round up at the same time as a vertical line
with square cap, when rendering at subpixel coordinates. Thus, the
special casing in the cosmetic stroker of offsetting by half a pixel
should be for flat caps instead of for square caps.
Task-number: QTBUG-26013
(cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e)
Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The test has one unstable failure on Windows, so mark this with QEXPECT_FAIL
Task-number: QTBUG-26906
Change-Id: I2f6c63ddefecacd224d93f83e6951e961a02a051
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
(cherry picked from qtbase/531b96f42ef225f6f680f6049ab718b0f6729a3d)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
| |
This change is not necessary on Qt5.
Change-Id: Ie35db0d31dccd2771ba80030ee9104880f50e6b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
This makes this test in line with other tests that define SRCDIR on the pro
file instead.
This change is not necessary in qt5
Change-Id: I789288c42a5c48bb62919fb361d2a357a8dd9832
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The Blackberry OS uses a filesystem with the noatime option,
which returns a "wrong" access time.
cherry-picked from qt5 31f94e028527ffa02b954a3a91eabe80e2926838
Change-Id: Ic37d19b62ffbed6f67dbbbdf76bb4202bb0472e5
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
Task-number: QTBUG-27122
Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This prevents memory leaks when the engine is destroyed after exec()
has already finished. In most cases this happens during application
shutdown, at which point the event loop is never entered again.
Task-number: QTBUG-20377
Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the access permissions for '/etc/passwd', however the
filesystem on Blackberry is always read-only.
cherry-picked from qt5 4a588c27e8073076cca19a8cc6eed5f1ce1d07e2
Change-Id: I6d14785dd94205761e3a73fc7aa420b805cd13a6
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
missing a attributesEmitted=true which caused the output from
toHtml() to sometimes be invalid when using pixel sizes to
specify the font size.
This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409
from Qt 5.
Task-number: QTBUG-25778
Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a parent item had its visiblity toggled, then the child item would
not update if the parent item had ItemHasNoContents and
ItemClipsChildrenToShape set. This is a common use case in declarative as
the root item has ItemHasNoContents set.
Task-number: QTBUG-26846
Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
|
|
|
|
|
| |
Change-Id: I543274c8f3ebb5f7f6cb8e6fc68cc9ee29050ac6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt::KeypadModifier modifier is internally masked away from all
shortcuts. So it is not possible to set a keypad only shortcut.
Changed the implementation so that first a full keysequence match is
searched. Then if no match is found the same sequence is tried
without the keypad modifer.
Added a autotest for this also to cover the basic use cases relating
to this.
This is a backport of qt5 commit:
547a1bea492954d828aa0798be93384669812489
Task-number: QTBUG-20191
Change-Id: Ibb6809050ff6da23bdb1c087b93e517d1963d34c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Call connectNotify() and disconnectNotify() in QML signal
handlers and in QML bindings.
This is a backport of Qt5's QtDeclarative commit
26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9.
Task-number: QTBUG-11284
Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
| |
It fails on Mountain Lion as well.
Change-Id: I9841e857c1746ed69ccad9dfccf3fb9135e6abde
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If you had a QTreeView with expandable items, if you tried to expand and while
the animation was still running you'd try to collpase the node,
the display would be completely broken: the items below that items would
not be visible any more except for a fraction of a second when expanding
or collapsing it again.
The problem is in the fact that when starting an animation the QTreeView
stores the state before animating. And it does that even if an animation
is already running. So the stateBeforeAnimation becomes AnimatingState and
when the animation finishes, AnimatingState is the state that is restored
breaking the painting.
Unit test is included.
qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17
Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Allow for a little more leeway in timers.
Task-number: QTBUG-26004
Change-Id: I59936d0f675b7f734e04b3f5e63631c74ca4f163
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit 4eecbf3b842afcfb91d78552ce19d2c0b8f8c53a)
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If setQObjectShared crashes because a QObject is tracked by two
different QSharedPointers, we lose the debug feature offered by #defining
QT_SHAREDPOINTER_TRACK_POINTERS, as the check done by this define
happens after the setQObjectShared call.
Therefore, move setQObjectShared after the internalSafetyCheckAdd2 call.
This way, the error raised by QSharedPointer created changes from f.i.
QSharedPointer: pointer 0xa10010 already has reference counting
to the more "debuggable" (and consistent with non-QObjects)
QSharedPointer: internal self-check failed: pointer 0x1dd90e0 was already tracked by another QSharedPointer object 0x1dd9330
"Backport" of change-id I71340d0f878828354537762d01c46d441efc918c from
qtbase (although, as of commit 609b0a9c2e69180ceff5d89c42e0d9468491d7e3,
this issue is not present there, as setQObjectShared does nothing).
Change-Id: I4cea83d705795eae0e05da128a3f189aea36f5ce
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
| |
This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from
qtbase.
Task-number: QTBUG-21804
Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804
Reviewed-by: Jani Honkonen <jani.honkonen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
| |
This test has been passing for some time now.
Change-Id: I8d03e3af184645b89b8a2e81be7d4bc5be14816e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
|
| |
This mark does not have any effect as the real mark is under
tests/auto/selftests/test/test.pro
Change-Id: I8885e6921940d0652326934dd1acc2d0cd3bc7a0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
| |
This test has been passing for some time now.
Change-Id: If33c0a4b675f6ab331fa64709c2c8c8f3f3ffb4e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Developers expect const methods on the same QUrl instance to be usable
from multiple threads (including copying and modifying the copy).
The delayed parsing and internal cache of encoded strings break this, however
(and the implicit sharing, for the case of copying).
Protection with a mutex fixes this.
Qt-5.0 doesn't have this issue, since QUrl doesn't do delayed parsing
anymore.
Change-Id: Ie2674e46eb7416b0e753323b673c10f9d3457f6d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.
Also added a test to check spacing in general.
Backported from Qt5 commit:
d2bba5e5535726f277e8dc67b1478168f57b24bd
Task-number: QTBUG-21804
Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
| |
The test has two unstable failures, so mark these with QEXPECT_FAIL
Task-number: QTBUG-26905
Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
|
|
| |
XFAIL'ing lots of failures on Linux and Mac.
Also removing some unused variables.
Task-number: QTBUG-26896
Change-Id: I1deb1ad0141e48d3df7cf0a2a4ea84c593f4a0fc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are some security issues with undo/redo. User should not be
able to get the erased password back in any situation. Therefore
redo must be disabled completely and undo is limited only for erasing
previously entered text.
Backported from Qt5 SHA1: 121062d8848986dcfaf421388a5603b3b48a1e58
Task-number: QTBUG-14226
Change-Id: Ia712f95e8a2e45537a95d48b70686a1a8dd95da2
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the selected item is scrolled with keyboard keys the selected item
will go outside the visible area. The scrolling did not take hidden
items into account when calculating the amout to be scrolled.
Backported from Qt5 commit:
d4385e48b8566a5587048a3c6d8b2396ba587ed5
Task-number: QTBUG-21804
Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
| |
The test has one unstable failure so mark it with QEXPECT_FAIL
until is fixed.
Task-number: QTBUG-26892
Change-Id: If7e647380a99db3145522c780980fe4904c76114
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
| |
This test was fixed by b1c46b4b3e322554146aed92cd6035cd9ba43982
Change-Id: I423ea7cb2587c23cc5afe2eac28bed8ba80d67a2
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
| |
This test has been passing for some time now.
Change-Id: I2ac0eaacab5e9873b691d3d1f5dad3d85ec90485
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
| |
This test has been passing in a stable way since build 679.
Change-Id: I19dd774793b11604ac0c725cc23adc58fd63cba7
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
|
|
| |
tst_QByteArray::qUncompress() no longer fails on QNX systems.
cherry-picked from qt commit 555e4e05f4f98f524e108fba0fb236406f2e2b2f
Change-Id: Ia88204b42f65a94c3f00c4b618255e1870c5a564
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
It was probably not implemented because it needed to access
private APIs.
However, accessing those from this a11y plugin is unproblematic.
Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|