| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
tst_qdeclarativetextinput fails on Mac OS X
Task-number: QTBUG-41316
Change-Id: I86724ecf0196ab4728f3bf14fcfc6cfe18bc20d1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix warnings when using MinGW:
main.cpp: In function 'int main(int, char**)':
main.cpp:734:55: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
^
main.cpp:735:53: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
^
main.cpp:736:54: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
where _CrtSetReportMode() is an empty macro.
Change-Id: Ibd9024246f59e0c5d1a6a6a017cd680fd60b0113
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a missing countChanged signal when model
changes happen while the itemview component is not
completely initialized.
Task-number: QTBUG-37115
Change-Id: I20c749b9e521b0292186adbecd09e1d362520881
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| | |
| | |
| | |
| | | |
Change-Id: I8eb3593fc738554c52999119439b5f5ff32933f7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Our CI metrics tell us that this test is in much better shape in
QtQuick2 than here. So let's apply the only differing change here, too.
Change-Id: I1985f20ba36b94d698699173fb911e393b31c215
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|/ /
| |
| |
| |
| |
| |
| | |
QtDemo was removed with a commit in qtdoc.
Change-Id: I73c11c66933d23565e38e3e93e1300b794a80f6a
Reviewed-by: Alessandro Portale <alessandro.portale@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>
|
|\ \
| |/
| |
| | |
Change-Id: Ie53408303d45db4bbc2030d3076f1ec868afedb2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On windows the debug version of qmlplugindumper used to show a panel on
assert failure. Failure should be silent.
Done-with: Thomas Hartmann <thomas.hartmann@digia.com>
Task-number: QTCREATORBUG-12644
Change-Id: I0491ab745a546687772cd0d70fb6b8be0f03bb75
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This issue cannot be reproduced on the desktop with a mouse (at least I
could not). It can however reliably be reproduced on iMX6 embedded hardware
with a touch-screen. It seems like the TS driver is reporting mouse events
with a much more coarse granularity than the USB mouse driver, which in turn
triggers this bug.
(Qt4's declarative, as well as Qt5's quick1 and 2 all have the same issue)
Change-Id: I01c9fc433a78d5f79518786783e24f3f93eaa50a
Task-number: QTBUG-27185
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDeclarativeExpression::evaluate() converts all arrays to QList<QObject *>,
even if the items cannot be represented by a QObject *. In case of a
string-list, a QList of null-pointers is returned (which isn't very helpful).
This patch makes evaluate() convert arrays, which contain ONLY value-type
items, into a plain QVariantList.
Change-Id: Ib8452cf9dd0241f146955f5de35336f48b9007c1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib0046657ba687e6427c67c7dce0d71ec3be87f48
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.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: I72c78f3c2920d7c27c013eaad39259a7c7009940
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ibcd05d8dcf19133830920d9eba3fa1450b3d3de1
|
| |
| |
| |
| | |
Change-Id: I83a2f252c5a0f105f4d0984652e41049009f8499
|
| |
| |
| |
| |
| |
| |
| | |
This change is similar to qtdeclarative/a292bcb1438034a24e95ec08be04a76ba832d793
Change-Id: I2d758d6725b32a8f9779e14560b9b61271a5cb97
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
notification.
Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses
new clipboard notification API that results in asynchronous clipboard
notifications.
This change is similar to qtdeclarative/a7122f3b2832ad65cfd0ab0ce0315a7042ee9f92
Change-Id: I3bb85f7dbc258f8f93cde8af1c9b24286b99ce21
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/declarative/qml/qdeclarativemetatype.cpp
Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The local storage facility exposed to QML has a bug; if you attempt to
open a versioned connection, the version is wrong, and you try to handle
that error, the connection is still stored in a connection pool, but in
an unopened state. The next time you attempt to connect, no matter if
you have the version right or not, the database handle will complain
about being unopened.
See also http://qt-project.org/forums/viewthread/38458/
Task-number: QTBUG-38543
Change-Id: I597497aab4895c868275a247ad96fb969e1c8ae5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix error 13 identified by static analysis from
http://www.viva64.com/en/b/0251/
This is in line with qtdeclarative.
Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
MSVC has #define interface struct, resulting in a nonsensical error from
the compiler about "struct: missing tag name" in a line that doesn't say
"struct".
Change-Id: I1ca703fd7920052e9d0bdf9a6936df77597ff022
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fix warning:
Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.
Change-Id: I33330bdbe7639de777b4f0fedd4ecadd184733bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |\
| | |
| | |
| | | |
Change-Id: Ied69074622a6d08ded39acd7e9f7949c1dbaabf8
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There was a bug fixed for this release.
Change-Id: I428a01111874c70d2151213d2b3c555444333aaa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |/
| |
| |
| |
| | |
Change-Id: Ifb2361ae4fe8e6d6e2f06dc20cb4c7b4739a7021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ie3850f2b3abc07fff45c563c9a80045fdd6468bb
|
| |
| |
| |
| |
| | |
Change-Id: Ifd4d0da3e79fc087f56a3d3c8104e35a66ef47fc
Reviewed-by: Alan Alpert <aalpert@blackberry.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>
|
|\ \
| |/
| |
| | |
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
|
| |
| |
| |
| |
| | |
Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Will need to change to QOpenGLContext::currentContext()->isES()
once the qtbase changes are in.
This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd.
Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDebug::operator<<(const char*) uses QString::fromUtf8(), while
qPrintable(str) returns QString::toLocal8Bit(). This messes up e.g. the
Russian translations.
Task-number: QTBUG-35825
Change-Id: Ib3f0004df677196a0bd17ac48c65f2d51b833044
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| | |
warning C4305: 'argument' : truncation fromm 'double' to 'float'
Change-Id: I7e419700b26ff66c48562b73db74b45ab1673c23
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ia3d0ffbe6ba6c8c34ec1ca2961953797d82ce282
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Not strictly necessary but it is better not to call glEnable()
with values that are not supported by GLES2. This way the
error state will not polluted by an invalid_enum or similar.
Change-Id: I952273f1814d9f124e5c4baa6196386645202439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
remove trailing spaces & expand tabs
Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|/
|
|
|
|
| |
Change-Id: I49e9b8117f01dfd86f6cdd73509d54575a187f0f
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|\
| |
| |
| | |
refs/staging/dev
|
| |\
| | |
| | |
| | | |
Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie57d6e5c8811a7845c55a069150de2fe0f796599
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
in qtbase
Pass through the QVariant argument provided by the caller (QInputMethod).
Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I9539aed1011325e201d7e32ea02b8c3fee77af30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: Id7ba78038c8504d960172923026245d28de182e8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|