| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ic7945d59fb0dd207997698259e770af626f9e7e7
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| | |
Change-Id: I39fe8076e53d159b060db8884df108a790bc6469
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5
|
| |
| |
| |
| |
| | |
Change-Id: I7d5d4708679d8fa8006428057b5acda87c1ede99
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The behavior of QDebug was fixed in qtbase. Update autotests
accordingly.
Change-Id: Ic39b7ddfc8a2fed6456ec617304aaf5035774e14
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|\|
| |
| |
| | |
Change-Id: Ib5b91e20ee9aff1fb0eba6854fa517961f8fce5b
|
| |\
| | |
| | |
| | | |
Change-Id: Id938fd62f7a500973b43f21e803f8b8c0c1a660d
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch changes QDeclarativeData to share the very first bit with QtQml's
QQmlData, to indicate ownership by either run-time. We need to check the bit in
the only QObject callback we use (destroyed), the other callback was unused and
removed.
Task-number: QTBUG-35006
Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie118f79e690ba82f6bc6410c3e8158d57f710060
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |/
| |
| |
| |
| |
| | |
Task-number: QTBUG-33871
Change-Id: I0dcd1fa10d82b929161afb044867983675064247
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I2c6a554f6033ce83379f2338fd3064ab39674215
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make sure we advertise the QDataStream version, so that Qt Creator
doesn't fall back to Qt_4.7.
This is the minimal change necessary to achieve this. QtQml does
actually consider the maximum data version announced on the client side,
but that would require bigger changes in this module ...
Task-number: QTCREATORBUG-10694
Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It gives different error message based on the case sensitivity of
the file system on Mac.
Task-number: QTBUG-32646
Change-Id: I8b5986a4bc8886924e678692c6679e571a11dd33
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ia64fcacff77933a00df6eecd866f75466f4f99a3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ia531065e3069aa010f99f91a8c8228788b3f0848
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|\|
| |
| |
| | |
Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b
|
| |
| |
| |
| |
| |
| |
| |
| | |
Use the correct identifier for the OS X operating system.
Change-Id: I5f93d63fc7e3041a45485ca10ccf5a1bde04bb01
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I5d94fe1e2fde1ff898afbd9da93f77deeb0a1769
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
|\|
| |
| |
| | |
Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933
|
| |
| |
| |
| |
| |
| | |
Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|/
|
|
|
|
|
|
| |
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|\
| |
| |
| | |
Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When installing the examples, we currently end up with a
QT_INSTALL_EXAMPLES/demos directory with nothing but documentation
files.
This change moves the docs and also the demos themselves into
examples/declarative/demos.
Also fixes the links in demo .qdoc files.
Task-number: QTBUG-31722
Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I061a46a31c7e16386a2040b4777bc797aaa635e2
|
| |
| |
| |
| |
| |
| |
| | |
shadereffects is already included conditionally a few lines below.
Change-Id: I8fd0a244708b0c5a820a0edc0fc9c9ce2e5513c0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Same (!a == b) issue as everywhere else. Can we please unify all those
parsers? They all are slightly different though, at least this issue,
is never on the same line number.
Change-Id: Ie2d1540d47b848ed0c7596b3f309c046b64390cf
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ic463237518c930fe367d0458859caa0050f45929
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1)Setting \qtvariable in module page.
\qtvariable indicates the QT variable needed in .pro files.
2)WS fixes.
Qt Quick 1 is deprecated but it is still nice to update the module page.
Change-Id: I5358a03566589a6910469c0bbd4a717e90be1c34
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add missing negation for the code snippet demonstrating accepting a
key event
Change-Id: Ia4c1cc4f207df9fb6e041ff088c6da2a63cd47b9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As expected. The test was using an invalid URL and thus
successfully comparing 2 empty images.
Task-number: QTBUG-32661
Change-Id: If6f0ad23454673b4b4fb2bc0a73da2b50663f171
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |\
| | |
| | |
| | | |
Change-Id: I23fb0ae0d08e0cdcda7d17c70cb19f1e499e1475
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I9062104d41ad4a4af352dc6366f550c09b3d8ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Introduce a scoped pointer for the views to ensure cleanup
after failing tests. Clear text in maxLength().
Move calls to QDeclarativeView::setFocus() below activation
for it to set the "active" focus item correctly.
Add message to obtain more information about failing tests.
Task-number: QTBUG-32538
Change-Id: Id65afbdfb0f9fd70846958fcb28fdd0fe1bd70f7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
| |/
| |
| |
| |
| | |
Change-Id: I36783bb7f976375cbc9b64a371889a8784350110
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I776abad2c248f697ff729057cfaff16b4a395380
|
| |
| |
| |
| |
| |
| |
| |
| | |
Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl>
Task-number: QTBUG-32332
Change-Id: I393308134d60e484464e0cfc6cdcdac1edc27f8d
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-32390
Change-Id: I373183e096390bd1564c2d263190fb9063a733a2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Setting a property like someObject.font.family would cause an out-of-bounds
assertion in QList, called from QQmlCompiler::genValueTypeProperty. This
appears to be a regression from commit
5e970b84663f5398eb51d4575856d1a3c44df953, which replaced one -1 to
QMetaType::QVariant too many times. It appears the use of -1 is rather
deliberate here and not to indicate the use of a QVariant property.
The attached test verifies this as well as the successful setting of the
property at the end.
Task-number: QTBUG-31576
Change-Id: I237ea08847e1db31481a311ea8ec23a5ccc702d8
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-32390
Change-Id: I3662046e22c014618ba07b1c8fddda13ac09690a
Reviewed-by: Leonard Lee <leonard.lee@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|