| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Task-number: QTBUG-40759
Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
|
|
|
|
|
|
|
| |
Found by GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c95df89028fe1c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
| |
The plugin does not link to any Qt Designer classes, so,
uiplugin is sufficient.
Task-number: QTBUG-44724
Change-Id: Ibecdccd7080c0752d5605c33f2bbe4e9eb0a0e44
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I647f478f9b888ed2bcdbda263446b82165c957e4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Add const_cast where we're really violating the correctness.
Found by GCC's -Wcast-qual.
Change-Id: Iee8cbc07c4434ce9b560ffff13c9619c48672f5a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
|\
| |
| |
| | |
Change-Id: I9c521184dcdc023bdaecf6643bb6c60cc1a80a9f
|
| |
| |
| |
| |
| |
| |
| |
| | |
-url inherited from the url variable set in qtbase/doc/global
Change-Id: I448ea5484c6956c6231e7a6ff93e29157e527755
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|\ \ |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 9cbb6fa added a regression, where empty arrays would produce errors
in QML 1.
Change-Id: Ie5c784d5ec921d1ca69084750ed37fc2e273bbef
Task-number: QTBUG-43656
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Detected by valgrind (in Qt 4.8.6):
==27068== Conditional jump or move depends on uninitialised value(s)
==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742)
Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc
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>
|
|\ \ |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
subscribeIndex is quint16, so it can't store a value of -1. Store 65535
instead.
Note: in findgeneric, subIdx will NOT be -1. It will be 65535.
Change-Id: I4b5ad6415609f409660a035de6f763ddb2da2f7e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.
Change-Id: I25c86ab233a79e71a4e0723c729a571014012cb8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
QStaticTextItem never uses `chars` and `numChars`.
A respective change to QStaticText will follow.
Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
The function is transitional from Qt4 to Qt5. It should not be called.
The patch is a semi cherry-pick of:
14e247e4b94df17ed62750b4468c2ac25aabe30f
a49154a75005403185e3813d441fb3e1931af2a2
1f74dde59f8ecb8be3a41973ab5d8d435815edd6
from qtdeclarative.
Change-Id: I5f90a58d6fa8d1df69e149da22e17e234173dd68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|\
| |
| |
| | |
Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63
|
| |
| |
| |
| |
| | |
Change-Id: Ied2bb3467f6d76cfab57bbd27c7f4b315c036d6f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I3d50df90315de4c73b5d49520585676197011072
Reviewed-by: Kai Koehne <kai.koehne@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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
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>
|
|\|
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
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>
|
|
|
|
|
|
|
|
|
| |
in qtbase
Pass through the QVariant argument provided by the caller (QInputMethod).
Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
| |
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: Id7ba78038c8504d960172923026245d28de182e8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|