| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The test failures point to a race condition in QtNetwork when a socket
is prematurely closed by the server. Anyhow, the race condition has
been there before, just that a recent change in Qt5Core made it more
likely to be hit.
Disabling the test for now: This is better handled in qtbase, and
shouldn't block the release.
Task-number: QTBUG-48299
Change-Id: If6877d47940d422e94b6d20d24a8fbdb89692f71
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: I5845c3aecc3856e5b375ea4c7742acc24ae97cc5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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: I9e68d256991ef7325c29c38ce9c007506ce6b150
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
On some CI machines (OS X 10.7) this test actually passes but takes
5100 ms to load the delegate.
Task-number: QTBUG-42264
Change-Id: I008cbf0e163257c800370951920384108e5a390b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
"file::2:23: ..." is strange to read. Show "<Unknown File>:2:23: ..." instead,
by treating empty urls (including "file:") as unknown, and by still showing
line and column numbers in such a case.
This change makes it possible for QUrl::fromLocalFile("") to return an
empty url rather than "file:", which this module was relying upon in the tests.
Change-Id: Id6d8aaa73673283cb65cbd1316dca77f859a3f8f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|\
| |
| |
| | |
Change-Id: I222f518e398b90382e452921411cfe81836ce02f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The current code only updates the alignment if the width of the
TextEdit changed, but we must also check if the height has changed.
Task-number: QTBUG-36069
[ChangeLog][QtDeclarative][TextEdit] Fixed TextEdit not vertically
aligning its text after having its height changed.
Change-Id: I428a01111874c70d2151213d2b3c5553e7f21186
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|\|
| |
| |
| | |
Change-Id: Ic5bcce627df03517c29597e6bb864f7b3fad2ebe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
d->yoff is the content offset when the content is not top aligned.
This means that positionToRectangle() returned incorrect values when
the content was bottom or vertical center aligned. In other words,
it didn't apply the offset but gave coordinates from the beginning of
the content instead of from the beginning of the item.
Change-Id: I044b79434b9a67b0539050e39953d5889a3ed1db
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|/
|
|
|
|
|
|
| |
remove trailing spaces & expand tabs
Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
The behavior of QDebug was fixed in qtbase. Update autotests
accordingly.
Change-Id: Ic39b7ddfc8a2fed6456ec617304aaf5035774e14
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduce a scoped pointer for the views to ensure cleanup
after failing tests. Fix calculation in positionAt() to
use a QPaintDevice and the first line of the text.
Move calls to QDeclarativeView::setFocus() below activation
for it to set the "active" focus item correctly.
Task-number: QTBUG-32538
Change-Id: Ibf10d00b9bddd587f5721d5b5011f6eafc617f39
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
|
|
| |
it's not entirely clear why anything inside the declarative module would
have a conditional on the presence of the declarative module ...
Change-Id: Ie6e22840b6d1d63da90c7d02aedb14fd870191af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Base on QDeclarativeDataTest to locate test data.
- Make small windows frameless to prevent errors from
minimum size constraints of decorated windows on Windows.
- Add test messages printing the value of comparisons.
- Skip alignment tests if no reference image exists:
Previously, the test would create an image file name
"<testfile>-unknown-architecture", find out it does not
exist, write out the 'actual' image under that name
(clobbering the source directory) and compare to it,
claiming success.
The reference image name is now composed of platform and style
name and the test is skipped if the file does not exist.
Task-number: QTBUG-28611
Change-Id: If1496e11db9638e7febd3af637ad55d7c6f11409
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: Ie6e37ab23b1bef99d294fe8a0acd95429a37a527
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
Task-number: QTBUG-25053
Change-Id: I9b0267e5fd947cec4b66debfa6c2795008643d18
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Change-Id: I020c82c465adaf6490a54871869bb6590542675f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Don't overwrite the ignore value once it's been set to true.
Backport from QtQUick2 to QtQuick1 in Qt 5
(commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9)
Change-Id: Ia93e234773bb75040f889cc03853be311dbafd70
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
| |
Adapt to QUrl changes, based on how qtdeclarative was adapted in
commit 2d393ae042d5badf0862c0f95122f9662042f2a9.
Change-Id: I9d1fddf4bbc6d86ac206dca4ac929d180ec12efa
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
| |
QTBUG-24035 - tst_qdeclarativetextedit::inputContextMouseHandler test fails.
Change-Id: I61ae74f1f4f19586abbdcae79f05f556a9904740
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
| |
Change-Id: Id11fc9ae1be91611fee22d28407e54035e190c71
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
| |
Files updated to mtach licensing conventions for different
types, and license text updated to match current.
Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib51b244f0e1a3e58ab06ddf5bdd0e244c8d09004
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Don't leave dangling pointers to test plaform input contexts,
clear preedit text from input before continuing with test,
allow some larger error for cursor positions across all platforms,
and add an expected failure for a failure originating in
QWidgetLineControl.
Change-Id: I843d13c29d8e44e5e6bfa71b67358b11c1741e97
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
|
|
|
|
|
|
| |
Remove uses of QLineControl, QTextControl and QBool and forward
declared QGraphicsWidget.
Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
|
|
|
| |
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
|