| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I39fe8076e53d159b060db8884df108a790bc6469
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: Ia64fcacff77933a00df6eecd866f75466f4f99a3
Reviewed-by: Alan Alpert <aalpert@blackberry.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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\|
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I19a932141748119ccdc0a9cd9f926403f67f5968
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For qdeclarativebinding_p.h, since the class is private, there is no
BC guarantee, so we can just remove the members. This class has a
friend, but the friend is also in the same .cpp.
qdeclarativebinding_p.h:139:14: error: private field 'm_object' is not used [-Werror,-Wunused-private-field]
qdeclarativebinding_p.h:140:9: error: private field 'm_index' is not used [-Werror,-Wunused-private-field]
For QSGGeometry, since this is a public class, we can't remove the
members. Just make them unused.
qsggeometry.h:124:11: error: private field 'm_reserved_pointer' is not used [-Werror,-Wunused-private-field]
qsggeometry.h:127:10: error: private field 'm_reserved_bits' is not used [-Werror,-Wunused-private-field]
Change-Id: Ia3650f38f32bd4cd705078a69c5445c64883bce4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
sync.profile
Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
warning C4510: 'QQmlPrivate::RegisterCompositeType' : default constructor could not be generated
Backport of a11f4e4318b3b9d04faf533b68809937fb2208e2 from qtdeclarative
Task-number: QTBUG-30454
Change-Id: I16ec8995ac1df3c92353006473ca082c4ed4e5b8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
| |
| |
| |
| |
| |
| | |
Removed deprecated "all rights reserved" string
Change-Id: Ib407aa8eee6e529bd5a59d152589e4231d5d979f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-31388
Change-Id: I16a137190c6a1ddba196b0624ade67c1e7fd9eed
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Separate the QML 1 and QML 2 debugger plugins. This helps avoid
a nasty crash in libgobject when (uneccessarily) loading and unloading
the wrong plugins.
Task-number: QTCREATORBUG-9232
Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move exported qml* symbols that conflict with QtQml into an - automatically
imported - namespace. This ensures apps can link against both
QtDeclarative and QtQml.
To keep the BC promise the old symbols are still exported.
Task-number: QTBUG-29584
Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| | |
The imports must be bundled in the apk.
Change-Id: I44cd4b442f9f3c8b6bf3534ffbfb8866475599e4
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|\|
| |
| |
| | |
Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
|
| |
| |
| |
| |
| |
| |
| | |
qpacketprotocol.cpp:299:12: error: variable "writeBytes" set but not used [-Werror=unused-but-set-variable]
Change-Id: I04a33119b30669dda688591aee60dcb2b7bbd41b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A common way to access the engine instance is via QDeclarativeView
- fix the code snippet accordingly.
Task-number: QTBUG-20747
Change-Id: Iff837f834ca6c950aa6c78c418f544789b4fcaf9
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I72c16f3affb297985e9e5d2e9f524537212d06ad
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
|
|\|
| |
| |
| | |
refs/staging/dev
|
| |\
| | |
| | |
| | |
| | |
| | | |
This starts Qt 5.1 release cycle
Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Calculate drag distance relative to the mouse position when a drag is
detected rather than the press position so there isn't a large change
in position on the first move.
Task-number: QTBUG-30188
Change-Id: I46918a7b3c62bdaef567b6a9fed651ce33434247
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes a regression whereby on the first mouse move the contentItem was
moved the total distance from the touch point to where the drag
distance was exceeded. For large drag thresholds this causes a
noticeable jump.
Task-number: QTBUG-30032
Change-Id: I92c119d27dc2e22203484f9ada5978697d171957
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Saving the int when we check the enum is valid allows us to make it a
literal assignment instead of a binding, which is much faster on object
creation.
Change-Id: Ieb174289438a17574c4716df372b04d4dee6d0da
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Store the qint64 julian day in 2 ints, allowing Qt Quick1
applications to work until approx 2.5 Quadrillion AD.
Task-number: QTBUG-28119
Change-Id: Id9cbcd8f01fb15e3eef13609e96d107b48b3ad9b
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|\|
| |
| |
| | |
Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In automated GUI test scenarios it often desired not to wait for animations
before verifying a result, so setting the duration to zero should accomplish
this, before this patch; if duration was set to zero QSmoothedAnimation
would treat it as if duration was not set, and used velocity to calculate
animation speed.
Change-Id: Ie6520d6c595bd014f3cab69bbb527e773f3850da
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Emit activeFocusChanged up the focus tree when an item receives a focus
event, rather than when the focusItem changes which happens before
internal state is sufficiently updated for hasFocus and hasActiveFocus
to return the correct values from within a changed signal handler.
There are some limitions to this. First the signals are not emitted
reliably when the scene is not active which makes sense for activeFocus
but not for focus. The second is in some instances the focus and
activeFocus can update unnecessarily while the focus chain sorts itself
out.
QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name>
Task-number: QTBUG-28288
Task-number: QTBUG-25644
Change-Id: Ib3d17c42754c15a08b34c3388f50b45cc1d2a831
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| |
| |
| |
| |
| | |
Change-Id: I74d07deb862ff7099eaeeae93b04be3c7496c5c8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I7fd31373b4d08130c1fb44bb5b203331313558c3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\|
| |
| |
| | |
Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.
Task-number: 29718
Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A MouseArea shouldn't prevent a parent MouseArea or Flickable from
handling a drag event unless it is going to do something useful with
it.
Task-number: QTBUG-29717
Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but
install it into into $QT_INSTALL_IMPORTS. Unify this by copying
it also directly into the imports directory.
Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|\ \
| | |
| | |
| | | |
refs/staging/dev
|
| |\|
| | |
| | |
| | | |
Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDoc doesn't differentiate between \badcode and \code. They both
look the same in the output.
Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|